From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#52826: vc-revert fails on non-default buffer name Date: Mon, 27 Dec 2021 19:53:38 +0200 Organization: LINKOV.NET Message-ID: <86k0fqj6kt.fsf@mail.linkov.net> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="31883"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (x86_64-pc-linux-gnu) To: 52826@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Dec 27 19:16:18 2021 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1n1uXf-00083O-VB for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 27 Dec 2021 19:16:15 +0100 Original-Received: from localhost ([::1]:37952 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n1uXd-00059J-Ju for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 27 Dec 2021 13:16:15 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:50404) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n1uXS-000592-C1 for bug-gnu-emacs@gnu.org; Mon, 27 Dec 2021 13:16:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:60919) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n1uXS-0003JN-2j for bug-gnu-emacs@gnu.org; Mon, 27 Dec 2021 13:16:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n1uXR-0003sX-W3 for bug-gnu-emacs@gnu.org; Mon, 27 Dec 2021 13:16:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 27 Dec 2021 18:16:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 52826 X-GNU-PR-Package: emacs X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.164062894114871 (code B ref -1); Mon, 27 Dec 2021 18:16:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 27 Dec 2021 18:15:41 +0000 Original-Received: from localhost ([127.0.0.1]:44232 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n1uX7-0003rm-CJ for submit@debbugs.gnu.org; Mon, 27 Dec 2021 13:15:41 -0500 Original-Received: from lists.gnu.org ([209.51.188.17]:39610) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n1uX3-0003ra-FQ for submit@debbugs.gnu.org; Mon, 27 Dec 2021 13:15:38 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:50336) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n1uX3-000578-9M for bug-gnu-emacs@gnu.org; Mon, 27 Dec 2021 13:15:37 -0500 Original-Received: from relay2-d.mail.gandi.net ([217.70.183.194]:40837) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n1uX1-00033h-80 for bug-gnu-emacs@gnu.org; Mon, 27 Dec 2021 13:15:37 -0500 Original-Received: (Authenticated sender: juri@linkov.net) by relay2-d.mail.gandi.net (Postfix) with ESMTPSA id CB66140007 for ; Mon, 27 Dec 2021 18:15:29 +0000 (UTC) Received-SPF: pass client-ip=217.70.183.194; envelope-from=juri@linkov.net; helo=relay2-d.mail.gandi.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:223207 Archived-At: When such customization is used: (add-hook 'diff-mode-hook 'rename-uniquely) that uniquely renames *vc-diff* to *vc-diff*, 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. --