From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#60897: 29.0.60; vc-revert fails to revert buffer Date: Mon, 23 Jan 2023 15:24:05 +0200 Message-ID: <83v8kxidu2.fsf@gnu.org> References: <29401.1674004194@hassadar.pretzelnet.org> <86edrr4zcz.fsf@mail.linkov.net> <868rhu5w0u.fsf@mail.linkov.net> <83cz76jqm5.fsf@gnu.org> <86v8kx3czh.fsf@mail.linkov.net> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="34738"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 60897@debbugs.gnu.org, epg@pretzelnet.org To: Juri Linkov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Jan 23 14:26:02 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 1pJwpm-0008rE-1J for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 23 Jan 2023 14:26:02 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pJwpU-0000U4-GQ; Mon, 23 Jan 2023 08:25:44 -0500 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 1pJwos-0000QC-QH for bug-gnu-emacs@gnu.org; Mon, 23 Jan 2023 08:25:12 -0500 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 1pJwoo-0008Jt-GO for bug-gnu-emacs@gnu.org; Mon, 23 Jan 2023 08:25:05 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pJwoo-0006jT-CJ for bug-gnu-emacs@gnu.org; Mon, 23 Jan 2023 08:25:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 23 Jan 2023 13:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60897 X-GNU-PR-Package: emacs Original-Received: via spool by 60897-submit@debbugs.gnu.org id=B60897.167448024525797 (code B ref 60897); Mon, 23 Jan 2023 13:25:02 +0000 Original-Received: (at 60897) by debbugs.gnu.org; 23 Jan 2023 13:24:05 +0000 Original-Received: from localhost ([127.0.0.1]:53650 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJwnt-0006i0-8w for submit@debbugs.gnu.org; Mon, 23 Jan 2023 08:24:05 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:56644) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJwnr-0006hX-Um for 60897@debbugs.gnu.org; Mon, 23 Jan 2023 08:24:04 -0500 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pJwnm-0008Cg-3o; Mon, 23 Jan 2023 08:23:58 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=NcgNyMlUu49X4PNc3IFy4RTAhe5De0s1xoaabZ+NZrc=; b=MeS9OdHn18lr iMoL2KP2OYaYKiqXrNnYgfp433sCQEEBolx2PbeU56eRNfxXBgO3rjU2/W2y56aiBlWyTDjCU0Dp5 9JcmqqQ8AfgRzRhv9o9hThyGfTY+k+n/4Tsx1zjFK468PgKI/f+TRPeJyLnGEW0nQZWgUolgRkcKV M8zFcAIqjlNbR7+nFXIPYYPhX+hcjPD8ydGFbr6+lEJQIbC3ZvSwsa6A+/H1vp0sZhf2nSjV/1eq7 BCeSpz+mV6sQ5SMnO0w998fmBmOJyQEK9vQPvtHEAGz9rkBUYppEcX+FocSEpwslOhuDvJT91tYl3 3dv77Mp9DVftYClX/zaMqw==; Original-Received: from [87.69.77.57] (helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pJwnl-0003dK-84; Mon, 23 Jan 2023 08:23:57 -0500 In-Reply-To: <86v8kx3czh.fsf@mail.linkov.net> (message from Juri Linkov on Mon, 23 Jan 2023 09:51:30 +0200) 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:253995 Archived-At: > From: Juri Linkov > Cc: epg@pretzelnet.org, 60897@debbugs.gnu.org > Date: Mon, 23 Jan 2023 09:51:30 +0200 > > >> > (defun vc-resynch-buffer (file &optional keep noquery reset-vc-info) > >> > "If FILE is currently visited, resynch its buffer." > >> > + (unless (file-name-absolute-p file) > >> > + (setq file (expand-file-name file (vc-root-dir)))) > >> > (if (string= buffer-file-name file) > >> > (vc-resynch-window file keep noquery reset-vc-info) > >> > (if (file-directory-p file) > >> > >> Eli, is this ok for the emacs-29 branch? I'm unsure because > >> vc-resynch-buffer is used in too many places, so this change > >> is not localized to vc-revert. > > > > You could use the expanded file name only for the purposes of the > > string= call, no? Then the effect of this change would be very local > > and thus safer. > > There is another string= call that fails inside vc-resynch-window > called from vc-resynch-buffer. How about replacing string= in these two cases with something smarter, which would expand-file-name? Comparing file names as simple strings is wrought with trouble anyway.