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: "Branislav Zahradník" <happy.barney@gmail.com>, 74509@debbugs.gnu.org
Subject: bug#74509: Feature request - smerge-mode
Date: Sat, 21 Dec 2024 21:54:00 -0500 [thread overview]
Message-ID: <jwvpllkcu5f.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <jwvzfkpf4wm.fsf-monnier+emacs@gnu.org> (Stefan Monnier's message of "Sat, 21 Dec 2024 10:11:30 -0500")
>> How should we go about this bug report?
>> Can we make some progress here? Or should we close it as wontfix?
> No, I think his commands make sense. We just need to improve them so
> they also work with 3-part conflicts.
I just pushed to `master` a version of `smerge-extend` which can
incorporate both following and preceding lines, and works with both
diff2 and diff3 style conflicts.
The OP also suggested binding this new command as well as `smerge-swap`
in the SMerge minor mode map (to `C-c ^ x` and `C-c ^ s` respectively).
That would shadow `M-x` and `M-s` (when `smerge-mode` is active) for
users who configured `smerge-command-prefix` to be ESC, so I think that
could be problematic. For that reason, I did not include that part.
Stefan
next prev parent reply other threads:[~2024-12-22 2:54 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-24 8:17 bug#74509: Feature request - smerge-mode Branislav Zahradník
2024-11-30 10:28 ` Eli Zaretskii
2024-12-01 23:51 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-12-02 7:59 ` Branislav Zahradník
2024-12-03 3:26 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-12-03 6:39 ` Branislav Zahradník
2024-12-21 8:47 ` Eli Zaretskii
2024-12-21 15:11 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-12-22 2:54 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors [this message]
2024-12-22 9:46 ` Branislav Zahradník
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=jwvpllkcu5f.fsf-monnier+emacs@gnu.org \
--to=bug-gnu-emacs@gnu.org \
--cc=74509@debbugs.gnu.org \
--cc=eliz@gnu.org \
--cc=happy.barney@gmail.com \
--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).