From: Eli Zaretskii <eliz@gnu.org>
To: Dmitry Gutov <dmitry@gutov.dev>,
Stefan Monnier <monnier@iro.umontreal.ca>
Cc: 73544@debbugs.gnu.org, dancol@dancol.org
Subject: bug#73544: smerge key bindings awkward
Date: Mon, 30 Sep 2024 14:31:19 +0300 [thread overview]
Message-ID: <86wmit2xa0.fsf@gnu.org> (raw)
In-Reply-To: <df27e8d9-b0d5-44ee-be31-cc9eef2b5f9e@gutov.dev> (message from Dmitry Gutov on Mon, 30 Sep 2024 03:33:02 +0300)
> Date: Mon, 30 Sep 2024 03:33:02 +0300
> From: Dmitry Gutov <dmitry@gutov.dev>
>
> On 29/09/2024 06:30, 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?
>
> Would it be better if 'C-c ^ n' jumped across files?
>
> I.e. effectively called smerge-vc-next-conflict.
>
> Not sure if it would always jump to the next file when reaching the end
> of the current one, or only when all hunks are resolved.
>
> Anyway, that approach would require making the bindings global, I think.
> The prev/next ones, at least.
Why does smerge-mode have to turn itself off when all conflicts are
resolved? Stefan?
next prev parent reply other threads:[~2024-09-30 11:31 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
2024-09-30 0:33 ` Dmitry Gutov
2024-09-30 4:41 ` Daniel Colascione
2024-09-30 11:31 ` Eli Zaretskii [this message]
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
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=86wmit2xa0.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=73544@debbugs.gnu.org \
--cc=dancol@dancol.org \
--cc=dmitry@gutov.dev \
--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).