From: Ivan Shmakov <ivan@siamics.net>
To: Emacs developers <emacs-devel@gnu.org>
Subject: Re: smerge-mode is fantastic, but it annoys me
Date: Wed, 04 Mar 2015 12:56:32 +0000 [thread overview]
Message-ID: <87a8zs2a67.fsf@violet.siamics.net> (raw)
In-Reply-To: <54F6FDE7.1080807@yahoo.fr> (Nicolas Richard's message of "Wed, 04 Mar 2015 13:43:19 +0100")
>>>>> Nicolas Richard <theonewiththeevillook@yahoo.fr> 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
next prev parent reply other threads:[~2015-03-04 12:56 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-03 1:47 smerge-mode is fantastic, but it annoys me Daniel Colascione
2015-03-03 12:49 ` Nicolas Richard
2015-03-03 16:43 ` Stefan Monnier
2015-03-04 12:43 ` Nicolas Richard
2015-03-04 12:56 ` Ivan Shmakov [this message]
2015-03-04 14:15 ` Nicolas Richard
2015-03-04 16:33 ` John Yates
2015-03-06 4:24 ` Nicolas Richard
2015-03-03 14:53 ` Barry Warsaw
2015-03-03 18:10 ` Stefan Monnier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87a8zs2a67.fsf@violet.siamics.net \
--to=ivan@siamics.net \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.