[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#60897: 29.0.60; vc-revert fails to revert buffer
From: |
Juri Linkov |
Subject: |
bug#60897: 29.0.60; vc-revert fails to revert buffer |
Date: |
Tue, 24 Jan 2023 19:46:51 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/30.0.50 (x86_64-pc-linux-gnu) |
>> >> > (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)
>>
>> 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.
This works as well:
diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el
index e1a3eff448d..8a0cdef4726 100644
--- a/lisp/vc/vc-dispatcher.el
+++ b/lisp/vc/vc-dispatcher.el
@@ -608,7 +608,7 @@ vc-resynch-window
difference between the buffer and the file is due to
modifications by the dispatcher client code, rather than user
editing!"
- (and (string= buffer-file-name file)
+ (and (string-prefix-p file buffer-file-name)
(if keep
(when (file-exists-p file)
(when reset-vc-info
@@ -643,7 +643,7 @@ vc-resynch-buffers-in-directory
(defun vc-resynch-buffer (file &optional keep noquery reset-vc-info)
"If FILE is currently visited, resynch its buffer."
- (if (string= buffer-file-name file)
+ (if (string-prefix-p file buffer-file-name)
(vc-resynch-window file keep noquery reset-vc-info)
(if (file-directory-p file)
(vc-resynch-buffers-in-directory file keep noquery reset-vc-info)
- bug#60897: 29.0.60; vc-revert fails to revert buffer, Eric Gillespie, 2023/01/17
- bug#60897: 29.0.60; vc-revert fails to revert buffer, Juri Linkov, 2023/01/18
- bug#60897: 29.0.60; vc-revert fails to revert buffer, Eric Gillespie, 2023/01/20
- bug#60897: 29.0.60; vc-revert fails to revert buffer, Juri Linkov, 2023/01/22
- bug#60897: 29.0.60; vc-revert fails to revert buffer, Eli Zaretskii, 2023/01/22
- bug#60897: 29.0.60; vc-revert fails to revert buffer, Juri Linkov, 2023/01/23
- bug#60897: 29.0.60; vc-revert fails to revert buffer, Eli Zaretskii, 2023/01/23
- bug#60897: 29.0.60; vc-revert fails to revert buffer,
Juri Linkov <=
- bug#60897: 29.0.60; vc-revert fails to revert buffer, Eli Zaretskii, 2023/01/24
- bug#60897: 29.0.60; vc-revert fails to revert buffer, Juri Linkov, 2023/01/24
- bug#60897: 29.0.60; vc-revert fails to revert buffer, Eli Zaretskii, 2023/01/24
- bug#60897: 29.0.60; vc-revert fails to revert buffer, Juri Linkov, 2023/01/24