From: Stefan Monnier via "Bug reports for GNU Emacs, the Swiss army knife of text editors" <bug-gnu-emacs@gnu.org>
To: Eli Zaretskii <eliz@gnu.org>
Cc: 73544@debbugs.gnu.org, Dmitry Gutov <dmitry@gutov.dev>,
Daniel Colascione <dancol@dancol.org>
Subject: bug#73544: smerge key bindings awkward
Date: Mon, 30 Sep 2024 08:39:11 -0400 [thread overview]
Message-ID: <jwvplolwc5n.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <86zfnr3tu9.fsf@gnu.org> (Eli Zaretskii's message of "Sun, 29 Sep 2024 08:35:42 +0300")
>> In smerge mode, C-c ^ n goes to the next merge conflict. Having resolved
>> all merge conflicts, smerge turns
>> itself off. Typing C-c ^ n again now puts a stray "n" into the buffer.
>> Is there some tweak we can make to avoid
>> this situation? Change the default of smerge-auto-leave?
FWIW, I use (setq smerge-command-prefix "\e") so for me the binding is
`M-n` which doesn't suffer from this problem.
Note: This setting has other downsides, of course, and can't be used as
a default.
Stefan
next prev parent reply other threads:[~2024-09-30 12:39 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-29 3:30 bug#73544: smerge key bindings awkward Daniel Colascione
2024-09-29 5:35 ` Eli Zaretskii
2024-09-30 12:39 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors [this message]
2024-09-29 23:27 ` Sean Whitton
2024-09-30 0:33 ` Dmitry Gutov
2024-09-30 4:41 ` Daniel Colascione
2024-09-30 11:31 ` Eli Zaretskii
2024-09-30 12:28 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
[not found] ` <86msjp2tya.fsf@gnu.org>
2024-09-30 14:50 ` Daniel Colascione
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=jwvplolwc5n.fsf-monnier+emacs@gnu.org \
--to=bug-gnu-emacs@gnu.org \
--cc=73544@debbugs.gnu.org \
--cc=dancol@dancol.org \
--cc=dmitry@gutov.dev \
--cc=eliz@gnu.org \
--cc=monnier@iro.umontreal.ca \
/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).