Re: smerge-mode is fantastic, but it annoys me

[Ivan Shmakov]

>>>>> Nicolas Richard <address@hidden> writes:

[…]

 > --- a/lisp/vc/smerge-mode.el
 > +++ b/lisp/vc/smerge-mode.el
 > @@ -1335,6 +1335,10 @@ define-minor-mode smerge-mode
 >  With a prefix argument ARG, enable the mode if ARG is positive,
 >  and disable it otherwise.  If called from Lisp, enable the mode
 >  if ARG is omitted or nil.
 > +
 > +The mode will turn itself off after the last conflict was

        s/was/is/.

 > +resolved.  You can customize `smerge-auto-leave' to control this
 > +behaviour.

        s/behaviour/behavior/.

        But perhaps we should shorten this down to something like “… if
        `smerge-auto-leave' is non-nil”?  There still would be
        “customize” in the variable’s own help, /and/ that would be a
        (conventional) link.

-- 
FSF associate member #7257  np. Play Your Part — Flotsam and Jetsam 230E 334A