unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
From: Richard Copley <rcopley@gmail.com>
To: 40967@debbugs.gnu.org, Nathan Moreau <nathan.moreau@m4x.org>
Subject: bug#40967: 27.0.50; vc-diff in indirect buffers
Date: Thu, 15 Oct 2020 09:08:45 +0100	[thread overview]
Message-ID: <CAPM58ojQozBf8V02wusDY-+zf34ZLSHhzV8BYc8mngEsoD+jEQ@mail.gmail.com> (raw)
In-Reply-To: <CADDcBWVrt9+5DPCwMUSiAY-etvZe=87ExwhopdVYb_vrBrDBGw@mail.gmail.com>

In 'vc-revision-other-window', the 'switch-to-buffer-other-window'
call is now wrapped in a 'with-current-buffer', and therefore
'vc-revision-other-window' no longer has the effect of switching
buffer.

This is unfortunate. See 'ediff-vc-internal':

    (vc-revision-other-window rev1)
    (setq rev1buf (current-buffer)
          file1 (buffer-file-name)))

At this point, 'file1' is intended to be the name of the versioned
backup file checked out by 'vc-revision-other-window'. With your
change, instead 'file1' is the name of the base file.

      [...]
      (push (lambda ()
          (ediff-delete-version-file file1)
          [...])
        startup-hooks))

The startup-hooks function deletes the base file containing the local
changes that the user wanted to examine, instead of the temporary
backup file.

Recipe, from emacs -Q:

* visit a file under vc that has local changes
* M-x ediff-revision RET RET RET RET

By the time the Ediff control panel appears, the file has been deleted.

That behaviour is, emphatically, NOT desirable. I'd even go as far as
to suggest it should be fixed as a matter of urgency, or reverted for
now. Just my opinion, of course.





      parent reply	other threads:[~2020-10-15  8:08 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-29 18:01 bug#40967: 27.0.50; vc-diff in indirect buffers Nathan Moreau
2020-04-29 18:13 ` Dmitry Gutov
2020-06-16 12:08   ` Phil Sainty
2020-06-16 22:37     ` Dmitry Gutov
2020-07-01  0:19       ` Nathan Moreau
2020-07-09 21:47         ` Nathan Moreau
2020-10-01 17:56           ` Lars Ingebrigtsen
2020-10-02  0:27             ` Nathan Moreau
2020-10-03 17:33               ` Lars Ingebrigtsen
2020-10-03 18:32                 ` Dmitry Gutov
2020-10-05  6:50                   ` Lars Ingebrigtsen
2020-10-15  8:08 ` Richard Copley [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=CAPM58ojQozBf8V02wusDY-+zf34ZLSHhzV8BYc8mngEsoD+jEQ@mail.gmail.com \
    --to=rcopley@gmail.com \
    --cc=40967@debbugs.gnu.org \
    --cc=nathan.moreau@m4x.org \
    /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).