From: Sean Whitton <spwhitton@spwhitton.name>
To: Daniel Colascione <dancol@dancol.org>
Cc: 73544@debbugs.gnu.org
Subject: bug#73544: smerge key bindings awkward
Date: Mon, 30 Sep 2024 07:27:09 +0800 [thread overview]
Message-ID: <8734lif3ci.fsf@melete.silentflame.com> (raw)
In-Reply-To: <02F453E6-82FE-45D8-9C99-E5D5AB348245@dancol.org> (Daniel Colascione's message of "Sat, 28 Sep 2024 23:30:13 -0400")
Hello,
On Sat 28 Sep 2024 at 11:30pm -04, Daniel Colascione wrote:
> 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?
A related issue is that it would be nice if C-c ^ n wrapped. Else you
have to both C-c ^ n and C-c ^ p to find the hunks to resolve.
--
Sean Whitton
next prev parent reply other threads:[~2024-09-29 23:27 UTC|newest]
Thread overview: 19+ 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
2024-09-29 23:27 ` Sean Whitton [this message]
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
2024-10-13 11:06 ` Eli Zaretskii
2024-10-13 16:01 ` Daniel Colascione
2024-10-13 16:13 ` Eli Zaretskii
2024-10-13 16:57 ` Daniel Colascione
2024-10-13 18:58 ` Eli Zaretskii
2024-10-17 17:37 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-10-17 18:44 ` Daniel Colascione
2024-10-21 23:56 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-10-22 5:12 ` Eli Zaretskii
2024-10-22 14:19 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
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=8734lif3ci.fsf@melete.silentflame.com \
--to=spwhitton@spwhitton.name \
--cc=73544@debbugs.gnu.org \
--cc=dancol@dancol.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.