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#28852: make revert-buffer ('g') in VC diff buffers keep point Date: Sat, 29 Jan 2022 20:48:36 +0200 Organization: LINKOV.NET Message-ID: <86mtjepizv.fsf@mail.linkov.net> References: <87tudm8rvr.fsf@gnus.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="19595"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (x86_64-pc-linux-gnu) Cc: "Charles A. Roelli" , 28852@debbugs.gnu.org To: Lars Ingebrigtsen Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat Jan 29 19:57:03 2022 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 1nDsuE-0004xD-3W for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 29 Jan 2022 19:57:02 +0100 Original-Received: from localhost ([::1]:37540 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nDsuC-0003bf-GU for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 29 Jan 2022 13:57:00 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:34612) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nDssK-0003bB-4A for bug-gnu-emacs@gnu.org; Sat, 29 Jan 2022 13:55:04 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:41910) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nDssI-00042x-1U for bug-gnu-emacs@gnu.org; Sat, 29 Jan 2022 13:55:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nDssH-0004qF-Nv for bug-gnu-emacs@gnu.org; Sat, 29 Jan 2022 13:55: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: Sat, 29 Jan 2022 18:55:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 28852 X-GNU-PR-Package: emacs Original-Received: via spool by 28852-submit@debbugs.gnu.org id=B28852.164348249118575 (code B ref 28852); Sat, 29 Jan 2022 18:55:01 +0000 Original-Received: (at 28852) by debbugs.gnu.org; 29 Jan 2022 18:54:51 +0000 Original-Received: from localhost ([127.0.0.1]:34810 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nDss6-0004pX-RT for submit@debbugs.gnu.org; Sat, 29 Jan 2022 13:54:51 -0500 Original-Received: from relay8-d.mail.gandi.net ([217.70.183.201]:39903) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nDss5-0004pE-59 for 28852@debbugs.gnu.org; Sat, 29 Jan 2022 13:54:49 -0500 Original-Received: (Authenticated sender: juri@linkov.net) by mail.gandi.net (Postfix) with ESMTPSA id AA36E1BF204; Sat, 29 Jan 2022 18:54:41 +0000 (UTC) In-Reply-To: <87tudm8rvr.fsf@gnus.org> (Lars Ingebrigtsen's message of "Sat, 29 Jan 2022 16:48:40 +0100") 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:225556 Archived-At: >> This will restore point to the same point it was before... but not to >> "where it was", necessarily, I think? > > I was confused about how these functions worked. I've respun the patch > for Emacs 29, and it seem to work very well, so I've now pushed it. This doesn't work with such customization: (add-hook 'diff-mode-hook 'rename-uniquely) because this change assumes that the current buffer is always "*vc-diff*" whereas the reverted buffer can be "*vc-diff*<2>". Isn't the reverted buffer always current during revert-buffer command? If this assumption is correct, how about his fix? diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 0096a5fcb3..1671f2f860 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -1798,10 +1798,9 @@ vc-diff-internal (coding-system-for-read (if files (vc-coding-system-for-diff (car files)) 'undecided)) (orig-diff-buffer-clone - (if (and (get-buffer buffer) revert-buffer-in-progress-p) - (with-current-buffer buffer - (clone-buffer - (generate-new-buffer-name " *vc-diff-clone*") nil))))) + (if revert-buffer-in-progress-p + (clone-buffer + (generate-new-buffer-name " *vc-diff-clone*") nil)))) ;; On MS-Windows and MS-DOS, Diff is likely to produce DOS-style ;; EOLs, which will look ugly if (car files) happens to have Unix ;; EOLs. --