unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
From: Eli Zaretskii <eliz@gnu.org>
To: Spencer Baugh <sbaugh@janestreet.com>,
	Stefan Monnier <monnier@iro.umontreal.ca>
Cc: 64071@debbugs.gnu.org
Subject: bug#64071: 28.2; smerge-diff creates *vc-diff* without setting it up
Date: Thu, 15 Jun 2023 10:20:18 +0300	[thread overview]
Message-ID: <83ttv9tcnh.fsf@gnu.org> (raw)
In-Reply-To: <ier1qidlo18.fsf@igm-qws-u22796a.mail-host-address-is-not-set> (message from Spencer Baugh on Wed, 14 Jun 2023 17:41:39 -0400)

> From: Spencer Baugh <sbaugh@janestreet.com>
> Date: Wed, 14 Jun 2023 17:41:39 -0400
> 
> 1. emacs -Q
> 2. Create a buffer containing:
> <<<<<<< left
> foo
> =======
> bar
> >>>>>>> right
> 3. M-x smerge-mode
> 4. M-x smerge-diff-upper-lower
> 5. The resulting *vc-diff* buffer is in diff-mode but it's not
> read-only, which is unusual for a *vc-diff* buffer.

That command enters diff-mode, and diff-mode doesn't force read-only
status on the current buffer.  Why should Smerge force that?

> Probably there is also other setup missing.

Which ones, and to what mode they belong?

> Relatedly, if a *vc-diff* buffer already exists, smerge-mode will use it
> without updating the mode-line, so it will say, for example, "Diff from
> *vc-change-log*" despite the diff being from smerge conflict resolution.

This should probably be easy to fix, and the fix should be safe enough
for the emacs-29 branch.  How about proposing such a fix, and leaving
the more controversial aspects of this alone for now?

Thanks.





  reply	other threads:[~2023-06-15  7:20 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-14 21:41 bug#64071: 28.2; smerge-diff creates *vc-diff* without setting it up Spencer Baugh
2023-06-15  7:20 ` Eli Zaretskii [this message]
2023-06-27 20:17   ` Spencer Baugh
2023-06-28 11:41     ` Eli Zaretskii
2023-06-28 12:48       ` Spencer Baugh
2023-06-28 12:58         ` Eli Zaretskii
2023-08-19 12:32           ` sbaugh
2023-08-19 12:48             ` Eli Zaretskii
2023-10-04 14:05               ` Spencer Baugh
2023-10-05  8:06                 ` Eli Zaretskii
2023-06-15 15:09 ` 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=83ttv9tcnh.fsf@gnu.org \
    --to=eliz@gnu.org \
    --cc=64071@debbugs.gnu.org \
    --cc=monnier@iro.umontreal.ca \
    --cc=sbaugh@janestreet.com \
    /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).