From: Stefan Monnier <monnier@IRO.UMontreal.CA>
To: Nicolas Richard <theonewiththeevillook@yahoo.fr>
Cc: Daniel Colascione <dancol@dancol.org>,
Emacs developers <emacs-devel@gnu.org>
Subject: Re: smerge-mode is fantastic, but it annoys me
Date: Tue, 03 Mar 2015 11:43:21 -0500 [thread overview]
Message-ID: <jwvfv9m9grf.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <874mq2z1n4.fsf@yahoo.fr> (Nicolas Richard's message of "Tue, 03 Mar 2015 13:49:51 +0100")
> It seems you should set smerge-auto-leave to nil. Are you saying it
> should be the default ? I would agree because the automated turn-off is
> a bit surprising. Or it should maybe be documented in the docstring of
> smerge-mode itself.
I don't have a strong opinion on this. I defaulted it to t because
I personally like this feature (I look at the mode line to know
if there are conflicts left, and I use an smerge-prefix that is mildly
annoying for "normal" editing, so turning it off early helps me avoid
key conflicts).
Stefan
next prev parent reply other threads:[~2015-03-03 16:43 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 [this message]
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
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=jwvfv9m9grf.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=dancol@dancol.org \
--cc=emacs-devel@gnu.org \
--cc=theonewiththeevillook@yahoo.fr \
/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.