From 0a3d584ce4167b0241bf2cdcf5c670fdea49f46f Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Sat, 17 Oct 2020 10:29:15 +0200 Subject: [PATCH] Avoid infloop in which-function-mode when a vc file has changed * lisp/vc/diff-mode.el (diff-find-source-location): Avoid warnings when called from which-function-mode and the file has changed (bug#42818). --- lisp/vc/diff-mode.el | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index d586afb97b0..7c9ad25eb31 100644 --- a/lisp/vc/diff-mode.el +++ b/lisp/vc/diff-mode.el @@ -1860,7 +1860,10 @@ SWITCHED is non-nil if the patch is already applied." (buf (if revision (let ((vc-find-revision-no-save t)) (vc-find-revision (expand-file-name file) revision diff-vc-backend)) - (find-file-noselect file)))) + ;; NOPROMPT is only non-nil when called from + ;; `which-function-mode', so avoid "File x changed + ;; on disk. Reread from disk?" warnings. + (find-file-noselect file noprompt)))) ;; Update the user preference if he so wished. (when (> (prefix-numeric-value other-file) 8) (setq diff-jump-to-old-file other)) -- 2.39.2