From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 27 13:15:41 2021 Received: (at submit) by debbugs.gnu.org; 27 Dec 2021 18:15:41 +0000 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 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 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 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 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) From: Juri Linkov To: bug-gnu-emacs@gnu.org Subject: vc-revert fails on non-default buffer name Organization: LINKOV.NET Date: Mon, 27 Dec 2021 19:53:38 +0200 Message-ID: <86k0fqj6kt.fsf@mail.linkov.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain 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-Spam-Score: -1.7 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.7 (--) 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. -- From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 27 19:33:58 2021 Received: (at 52826) by debbugs.gnu.org; 28 Dec 2021 00:33:58 +0000 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 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 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) 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) Subject: Re: bug#52826: vc-revert fails on non-default buffer name To: Juri Linkov , 52826@debbugs.gnu.org References: <86k0fqj6kt.fsf@mail.linkov.net> From: Dmitry Gutov Message-ID: <9352db53-6a7a-a500-5a29-a1370f052724@yandex.ru> Date: Tue, 28 Dec 2021 02:32:30 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 MIME-Version: 1.0 In-Reply-To: <86k0fqj6kt.fsf@mail.linkov.net> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Score: 0.4 (/) X-Debbugs-Envelope-To: 52826 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.6 (/) 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. From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 28 03:49:06 2021 Received: (at 52826) by debbugs.gnu.org; 28 Dec 2021 08:49:06 +0000 Received: from localhost ([127.0.0.1]:45012 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n28AM-0001ej-0r for submit@debbugs.gnu.org; Tue, 28 Dec 2021 03:49:06 -0500 Received: from relay3-d.mail.gandi.net ([217.70.183.195]:43577) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n28AJ-0001dn-L6; Tue, 28 Dec 2021 03:49:04 -0500 Received: (Authenticated sender: juri@linkov.net) by relay3-d.mail.gandi.net (Postfix) with ESMTPSA id CAA996000B; Tue, 28 Dec 2021 08:48:55 +0000 (UTC) From: Juri Linkov To: Dmitry Gutov Subject: Re: bug#52826: vc-revert fails on non-default buffer name Organization: LINKOV.NET References: <86k0fqj6kt.fsf@mail.linkov.net> <9352db53-6a7a-a500-5a29-a1370f052724@yandex.ru> Date: Tue, 28 Dec 2021 10:47:39 +0200 In-Reply-To: <9352db53-6a7a-a500-5a29-a1370f052724@yandex.ru> (Dmitry Gutov's message of "Tue, 28 Dec 2021 02:32:30 +0200") Message-ID: <86zgol9kus.fsf@mail.linkov.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 52826 Cc: 52826@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) close 52826 29.0.50 quit > If this help, LGTM. So pushed to master in a17a11df04. From unknown Sat Jun 21 03:31:18 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Tue, 25 Jan 2022 12:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator