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#63949: 30.0.50; =?UTF-8?Q?`vc-print-log=C2=B4?= does not erase buffer when called from *vc-change-log* buffer, at least for CVS logs Date: Tue, 20 Jun 2023 05:41:47 +0300 Message-ID: References: <8c62dd9a-3cad-b992-bfc4-64b2f1db4485@vodafonemail.de> <87fs729jxu.fsf@ledu-giraud.fr> <7bc0c78e-e4b5-0edc-0e9f-2f8fbafc352f@vodafonemail.de> <83y1kt180v.fsf@gnu.org> <8477db3b-b237-aa4b-b4aa-41d31cb77ac1@vodafonemail.de> <834jnf26v2.fsf@gnu.org> <83ilbvz0xx.fsf@gnu.org> <7fe39b49-8319-d7ab-99b3-afe10dc62177@vodafonemail.de> <1c00eecf-9285-3b9e-cf9f-4eba56461ae7@gutov.dev> <83jzw1pc2h.fsf@gnu.org> <1e7358a7-5446-6a89-3556-57e779b545ee@vodafonemail.de> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="9313"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 Cc: 63949@debbugs.gnu.org, Eli Zaretskii To: Jens Schmidt Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Jun 20 04:42:15 2023 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 1qBRJu-0002CW-FU for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 20 Jun 2023 04:42:15 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qBRJk-0003LY-1d; Mon, 19 Jun 2023 22:42:04 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qBRJi-0003L3-JA for bug-gnu-emacs@gnu.org; Mon, 19 Jun 2023 22:42:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qBRJi-0004Iz-Ax for bug-gnu-emacs@gnu.org; Mon, 19 Jun 2023 22:42:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qBRJh-0005CB-Vp for bug-gnu-emacs@gnu.org; Mon, 19 Jun 2023 22:42:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 20 Jun 2023 02:42:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63949 X-GNU-PR-Package: emacs Original-Received: via spool by 63949-submit@debbugs.gnu.org id=B63949.168722891819962 (code B ref 63949); Tue, 20 Jun 2023 02:42:01 +0000 Original-Received: (at 63949) by debbugs.gnu.org; 20 Jun 2023 02:41:58 +0000 Original-Received: from localhost ([127.0.0.1]:57685 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qBRJd-0005Bu-J1 for submit@debbugs.gnu.org; Mon, 19 Jun 2023 22:41:58 -0400 Original-Received: from out3-smtp.messagingengine.com ([66.111.4.27]:54299) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qBRJb-0005Bf-9Y for 63949@debbugs.gnu.org; Mon, 19 Jun 2023 22:41:55 -0400 Original-Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 296035C0118; Mon, 19 Jun 2023 22:41:50 -0400 (EDT) Original-Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Mon, 19 Jun 2023 22:41:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gutov.dev; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to; s=fm3; t= 1687228910; x=1687315310; bh=ir4Uz2C5K4XzEfTNcFFmHTkvkT/0574jwkZ 1VvHWnKg=; b=P0mruua8rUMEuZ+S03SGDpT2ITho21OE/9ztumVtsLBqSOuNFX9 yw/WRntnpirdwvmjMOSvCvij1iLfsDUQwGrZNk1itwUzkEm/Nt5Z708/0YEWDLWw +ImQjDYj5bhyY6UFsCWFHCkt5Q7cfJvW7uXAMwvbA+gKHwRPaYO19hqonzyc5Zg5 QrXBQukcL1M7wLu1G1vnj64lej5TZqmfxhY90WXbp1B9Qs9yf2E0U/1KCA36YpU6 ya8G4QWkA0CjojE7vbJXhw146yn7dRI+b4VTi+7+q7Z/nXqzfqptmmMlhT3Koda5 Igm7zahhYfr76IIHtlncjCFjvat7CfWjOqQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t= 1687228910; x=1687315310; bh=ir4Uz2C5K4XzEfTNcFFmHTkvkT/0574jwkZ 1VvHWnKg=; b=XWuC4PHZkf8KcGxWsvFvXN5AbWfodhPlGGvk83NG7UmX3BDRdJ2 jfi0VOF7Z6+WWdoscu+38rg/CvtOUR9PepGGwJMr2D+P8pN6SYGup5itg8ozwSN5 9row2KWn2XQHDS54ISHGpoyn1c2xXnxApWF2QwhrAZV4OcBMs45dkOzuwIKHTlux GREmJ3FDR05OYMtbqiDt182UQVmvjfMXpyQ9oAX8NfpF4YOnpjAJrdd0RmEk2rjO xALG7EQrT15eagILQ7hozmKMNvVmIbOWqNqmdgdXb9G3DzhPmlnmb3fPgD932RpR 3X0bGVmoeKXKJlLSqlHGEC9jcDsJVUustXw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrgeefgedgudelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepkfffgggfuffvfhevhfgjtgfgsehtkeertddtfeejnecuhfhrohhmpeffmhhi thhrhicuifhuthhovhcuoegumhhithhrhiesghhuthhovhdruggvvheqnecuggftrfgrth htvghrnhepveffuddtkefgffefieefhfehfeelieevieejfefgudfhkeevfedvgeffveel heejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepug hmihhtrhihsehguhhtohhvrdguvghv X-ME-Proxy: Feedback-ID: i0e71465a:Fastmail Original-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 19 Jun 2023 22:41:48 -0400 (EDT) Content-Language: en-US In-Reply-To: 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-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:263730 Archived-At: (Please keep the bug address in Cc). On 18/06/2023 16:21, Jens Schmidt wrote: > On 2023-06-18  14:00, Dmitry Gutov wrote: > >> Could you test the patch I showed? > > Will do, pls just give me some time here... Thanks. If we can verify that the part broken by the bisected revision, is fixed here, we could push that to Emacs 29 and then clean up for Emacs 30 more thoroughly. In the meantime, here's the updated patch. The previous one discarded the return value :( diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 91d3f6f70d3..c8b2b3ac11d 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -1121,10 +1121,15 @@ vc-deduce-fileset the returned list. BEWARE: this function may change the current buffer." - (with-current-buffer (or (buffer-base-buffer) (current-buffer)) - (vc-deduce-fileset-1 not-state-changing - allow-unregistered - state-model-only-files))) + (let (new-buf res) + (with-current-buffer (or (buffer-base-buffer) (current-buffer)) + (setq res + (vc-deduce-fileset-1 not-state-changing + allow-unregistered + state-model-only-files)) + (setq new-buf (current-buffer))) + (set-buffer new-buf) + res)) (defun vc-deduce-fileset-1 (not-state-changing allow-unregistered