all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Eli Zaretskii <eliz@gnu.org>
To: Daniel Colascione <dancol@dancol.org>
Cc: 73544@debbugs.gnu.org, dmitry@gutov.dev, monnier@iro.umontreal.ca
Subject: bug#73544: smerge key bindings awkward
Date: Sun, 13 Oct 2024 14:06:11 +0300	[thread overview]
Message-ID: <86r08ktg7w.fsf@gnu.org> (raw)
In-Reply-To: <586D4862-3603-46AE-9A8F-163BD7FB2FAA@dancol.org> (message from Daniel Colascione on Mon, 30 Sep 2024 07:50:50 -0700)

> Date: Mon, 30 Sep 2024 07:50:50 -0700
> From: Daniel Colascione <dancol@dancol.org>
> CC: dmitry@gutov.dev, 73544@debbugs.gnu.org
> 
> 
> 
> On September 30, 2024 5:43:09 AM PDT, Eli Zaretskii <eliz@gnu.org> wrote:
> >> From: Stefan Monnier <monnier@iro.umontreal.ca>
> >> Cc: Dmitry Gutov <dmitry@gutov.dev>,  dancol@dancol.org,  73544@debbugs.gnu.org
> >> Date: Mon, 30 Sep 2024 08:28:33 -0400
> >> 
> >> > Why does smerge-mode have to turn itself off when all conflicts are
> >> > resolved?  Stefan?
> >> 
> >> It doesn't have to.  It's just useless when all conflicts are resolved,
> >> so it's convenient for it to turn itself off in that case.  It also lets
> >> you use the `SMerge` lighter in the mode line as an indication that
> >> there are still merge conflicts to resolve in the buffer.
> >
> >That's what I thought.
> >
> >So maybe a possible solution to Daniel's problem would be a (maybe
> >optional) behavior, whereby when conflicts are resolved, smerge-mode
> >doesn't turn itself off, but instead changes the lighter to indicate
> >that there are no more conflicts?
> >
> >Daniel, would that solve your problem?  If it would, I think it's
> >better than making the "C-x ^" keymap global, which would have a
> >significant global effect, and might break someone's key bindings.
> 
> 
> That's a solution, sure. We could also have the lighter contain a visual indication of the number of conflict regions in the buffer, like flymake. 

Actually, I see that the first part of this is already there: we have
a defcustom smerge-auto-leave, whose default is t.  So does it mean we
can consider this bug fixed?





  reply	other threads:[~2024-10-13 11:06 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
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 [this message]
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=86r08ktg7w.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 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.