GNU bug report logs - #52826
vc-revert fails on non-default buffer name

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 52826 in the body.
You can then email your comments to 52826 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Juri Linkov <juri <at> linkov.net>
To: bug-gnu-emacs <at> gnu.org
Subject: vc-revert fails on non-default buffer name
Date: Mon, 27 Dec 2021 19:53:38 +0200

When such customization is used:

  (add-hook 'diff-mode-hook 'rename-uniquely)

that uniquely renames *vc-diff* to *vc-diff*<number>,
then 'vc-revert' completely breaks up because of the hard-coded buffer name.
This patch should fix it:

diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 9fc9169821..5a99025289 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -2785,7 +2785,7 @@ vc-revert
     (unwind-protect
 	(when (if vc-revert-show-diff
 		  (progn
-		    (setq diff-buffer (generate-new-buffer-name "*vc-diff*"))
+		    (setq diff-buffer (generate-new-buffer "*vc-diff*"))
 		    (vc-diff-internal vc-allow-async-revert vc-fileset
 				      nil nil nil diff-buffer))
 		;; Avoid querying the user again.
-- 

Message #8 received at 52826 <at> debbugs.gnu.org (full text, mbox):

From: Dmitry Gutov <dgutov <at> yandex.ru>
To: Juri Linkov <juri <at> linkov.net>, 52826 <at> debbugs.gnu.org
Subject: Re: bug#52826: vc-revert fails on non-default buffer name
Date: Tue, 28 Dec 2021 02:32:30 +0200

On 27.12.2021 20:53, Juri Linkov wrote:
> When such customization is used:
> 
>    (add-hook 'diff-mode-hook 'rename-uniquely)
> 
> that uniquely renames*vc-diff*  to*vc-diff*<number>,
> then 'vc-revert' completely breaks up because of the hard-coded buffer name.
> This patch should fix it:
> 
> diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
> index 9fc9169821..5a99025289 100644
> --- a/lisp/vc/vc.el
> +++ b/lisp/vc/vc.el
> @@ -2785,7 +2785,7 @@ vc-revert
>       (unwind-protect
>   	(when (if vc-revert-show-diff
>   		  (progn
> -		    (setq diff-buffer (generate-new-buffer-name "*vc-diff*"))
> +		    (setq diff-buffer (generate-new-buffer "*vc-diff*"))
>   		    (vc-diff-internal vc-allow-async-revert vc-fileset
>   				      nil nil nil diff-buffer))
>   		;; Avoid querying the user again.

If this help, LGTM.

Message #11 received at 52826 <at> debbugs.gnu.org (full text, mbox):

From: Juri Linkov <juri <at> linkov.net>
To: Dmitry Gutov <dgutov <at> yandex.ru>
Cc: 52826 <at> debbugs.gnu.org
Subject: Re: bug#52826: vc-revert fails on non-default buffer name
Date: Tue, 28 Dec 2021 10:47:39 +0200

close 52826 29.0.50
quit

> If this help, LGTM.

So pushed to master in a17a11df04.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.