From: Nicolas Richard <theonewiththeevillook@yahoo.fr>
To: John Yates <john@yates-sheets.org>
Cc: Nicolas Richard <theonewiththeevillook@yahoo.fr>,
Emacs developers <emacs-devel@gnu.org>
Subject: Re: smerge-mode is fantastic, but it annoys me
Date: Fri, 06 Mar 2015 05:24:10 +0100 [thread overview]
Message-ID: <87r3t2kb2t.fsf@yahoo.fr> (raw)
In-Reply-To: CAJnXXohW0xKotHQRb8rUV2hoE-GNiXwvT5_f3zVJWFVZHV42mw@mail.gmail.com
John Yates <john@yates-sheets.org> writes:
> On Wed, Mar 4, 2015 at 9:15 AM, Nicolas Richard
> <theonewiththeevillook@yahoo.fr> wrote:
>
>
> The mode will turn itself off after the last conflict is
> resolved, if the variable `smerge-auto-leave' is non-nil.
>
>
> I find it clearer to list pre-conditions first and then causes before
> effects:
That also crossed my mind, but when I re-read it, I thought that the
effect is more important than the condition (because the effect is what
happens by default, and is surprising wrt how other modes behave).
--
Nicolas
next prev parent reply other threads:[~2015-03-06 4:24 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
2015-03-04 14:15 ` Nicolas Richard
2015-03-04 16:33 ` John Yates
2015-03-06 4:24 ` Nicolas Richard [this message]
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87r3t2kb2t.fsf@yahoo.fr \
--to=theonewiththeevillook@yahoo.fr \
--cc=emacs-devel@gnu.org \
--cc=john@yates-sheets.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 public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).