From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.bugs Subject: bug#52826: vc-revert fails on non-default buffer name Date: Tue, 28 Dec 2021 02:32:30 +0200 Message-ID: <9352db53-6a7a-a500-5a29-a1370f052724@yandex.ru> References: <86k0fqj6kt.fsf@mail.linkov.net> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="23156"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 To: Juri Linkov , 52826@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Dec 28 01:34:10 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 1n20RO-0005mi-Ci for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 28 Dec 2021 01:34:10 +0100 Original-Received: from localhost ([::1]:51356 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n20RM-0005bU-Fb for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 27 Dec 2021 19:34:08 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:45368) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n20RG-0005b6-Vl for bug-gnu-emacs@gnu.org; Mon, 27 Dec 2021 19:34:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:33142) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n20RG-0000H3-Mc for bug-gnu-emacs@gnu.org; Mon, 27 Dec 2021 19:34:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n20RG-0002ef-8i for bug-gnu-emacs@gnu.org; Mon, 27 Dec 2021 19:34:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 28 Dec 2021 00:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52826 X-GNU-PR-Package: emacs Original-Received: via spool by 52826-submit@debbugs.gnu.org id=B52826.164065163810194 (code B ref 52826); Tue, 28 Dec 2021 00:34:02 +0000 Original-Received: (at 52826) by debbugs.gnu.org; 28 Dec 2021 00:33:58 +0000 Original-Received: from localhost ([127.0.0.1]:44688 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n20R8-0002eI-FF for submit@debbugs.gnu.org; Mon, 27 Dec 2021 19:33:58 -0500 Original-Received: from mail-wr1-f51.google.com ([209.85.221.51]:37429) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n20R2-0002dw-Fu for 52826@debbugs.gnu.org; Mon, 27 Dec 2021 19:33:52 -0500 Original-Received: by mail-wr1-f51.google.com with SMTP id t26so35086175wrb.4 for <52826@debbugs.gnu.org>; Mon, 27 Dec 2021 16:33:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:subject:to:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=I1oYISG9gsgEvD4eC6SYemzWsAjniNGfAzfQhY+siqI=; b=IsEkB5Rcs4CRSMrwMAgB/zk0Ejkxt/emZq4PY5hHePLH2rBniw6PNUj42hiZFRBw2F umHukqYEd0rlVStw8Y/wDQ72pgHMDeNZg8z6FOblbx+OWKGvMJ8kE1d56K6COwoO4CIz VxEqe09QJLaH84ZuaKAbcdUIP6kd3GtcosN48nZw2dHWCxweYrmbh1tetdqJB/BNY+7F t/K3xmPa7CnErRonTFBuij5OQBUc9jg0hEUKIgpnlmCCdMKfsEI66TD5HXLDSt6TejlY B0DtoABag3IS5e//okmAuOWNX68bydPSu+/wBgPL8B1gDrcpOExyKziEYAEFVZePJIkG nibQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:subject:to:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=I1oYISG9gsgEvD4eC6SYemzWsAjniNGfAzfQhY+siqI=; b=4F49byLPcN0KSdpbQeojgbvYbG6K76Xr7DzQY7D0eLZgFhVzwjhlVzrAMvp5V4AHNM HcGPMUgZustKA68OzSMN+IPCWVUT1FH5yImWb5ObYZw9ro/jdH6sCfeRRULZPBhAM7S0 JY9c5BFtlY8T64OTuIt6kOfVfKFEWJn700hBCTXEmgHhCxeTXIckgAvFu3ChyfaU3UT/ McmD5XQsrQwuM8TzuEGcfBMa0lV2Osdu3LYtzX/+XqRgImVdjHuxdtCO9vmoLG6NG8aR 4WdxNQQP8esfJSQLrJ2QFNKfFwUWPaIfDHxKf3ymjXJEGugLD3DfOMG2wv+DxHF1EGQj nLjA== X-Gm-Message-State: AOAM533vA8Ha3nc5NDydJqVW4/sLxJngx++8Ej4p/bOUKSwxRD6x6sWE XFUfCU1+LM7NlZ82FIBz69IwXNZr2OA= X-Google-Smtp-Source: ABdhPJwX56shBfGspm3W+ZDwRH3GVHI5e48mFKLP1WIjwwLDCZjR4+Z83NA3Rc9AUz97/1z+S0uOZg== X-Received: by 2002:adf:fe86:: with SMTP id l6mr14436733wrr.99.1640651622596; Mon, 27 Dec 2021 16:33:42 -0800 (PST) Original-Received: from [10.111.255.129] ([185.209.196.135]) by smtp.googlemail.com with ESMTPSA id u11sm8294767wmq.41.2021.12.27.16.33.41 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 27 Dec 2021 16:33:42 -0800 (PST) In-Reply-To: <86k0fqj6kt.fsf@mail.linkov.net> Content-Language: en-US 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:223220 Archived-At: 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*, > 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.