[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: smerge-mode is fantastic, but it annoys me
From: |
Ivan Shmakov |
Subject: |
Re: smerge-mode is fantastic, but it annoys me |
Date: |
Wed, 04 Mar 2015 12:56:32 +0000 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) |
>>>>> 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
- smerge-mode is fantastic, but it annoys me, Daniel Colascione, 2015/03/02
- Re: smerge-mode is fantastic, but it annoys me, Nicolas Richard, 2015/03/03
- Re: smerge-mode is fantastic, but it annoys me, Stefan Monnier, 2015/03/03
- Re: smerge-mode is fantastic, but it annoys me, Nicolas Richard, 2015/03/04
- Re: smerge-mode is fantastic, but it annoys me,
Ivan Shmakov <=
- Re: smerge-mode is fantastic, but it annoys me, Nicolas Richard, 2015/03/04
- Re: smerge-mode is fantastic, but it annoys me, John Yates, 2015/03/04
- Re: smerge-mode is fantastic, but it annoys me, Nicolas Richard, 2015/03/05
Re: smerge-mode is fantastic, but it annoys me, Barry Warsaw, 2015/03/03