From: Stefan Monnier via "Bug reports for GNU Emacs, the Swiss army knife of text editors" <bug-gnu-emacs@gnu.org>
To: Spencer Baugh <sbaugh@janestreet.com>
Cc: 64071@debbugs.gnu.org
Subject: bug#64071: 28.2; smerge-diff creates *vc-diff* without setting it up
Date: Thu, 15 Jun 2023 11:09:02 -0400 [thread overview]
Message-ID: <jwvcz1w22hn.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <ier1qidlo18.fsf@igm-qws-u22796a.mail-host-address-is-not-set> (Spencer Baugh's message of "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. Probably there is
> also other setup missing.
Good catch, indeed.
> 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.
Hmm... that's also a bug, indeed. I'm tempted to say that maybe the bug
is in the code which changed the `mode-line-format` (it should arguably
either not change it, or arrange to have it reset when it doesn't match
the buffer's contents any more).
> This bug is also present in Emacs 29 and trunk.
>
> The below diff resolves the read-only part. But maybe we want to be
> creating the *vc-diff* by calling into vc, which would also fix the
> mode-line part?
>
> diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el
> index c39a9cc2f22..65d93c17a64 100644
> --- a/lisp/vc/smerge-mode.el
> +++ b/lisp/vc/smerge-mode.el
> @@ -1259,6 +1259,7 @@ smerge-diff
> (if (eq status 0) (insert "No differences found.\n"))))
> (goto-char (point-min))
> (diff-mode)
> + (read-only-mode)
> (display-buffer (current-buffer) t))
> (delete-file file1)
> (delete-file file2))))
LGTM.
Stefan
prev parent reply other threads:[~2023-06-15 15:09 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
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 [this message]
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=jwvcz1w22hn.fsf-monnier+emacs@gnu.org \
--to=bug-gnu-emacs@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).