From 3c5989da748f1a9aae83303291ef07d29202a139 Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Thu, 19 Nov 2015 03:37:55 +0200 Subject: [PATCH] Prioritize looking inside vc-parent-buffer over log-view-mode fallback * lisp/vc/vc.el (vc-deduce-fileset): Prioritize looking inside vc-parent-buffer over log-view-mode fallback (bug#21955). --- lisp/vc/vc.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 0edbc94ecf6..8d72a365614 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -1026,9 +1026,6 @@ BEWARE: this function may change the current buffer." (if observer (vc-dired-deduce-fileset) (error "State changing VC operations not supported in `dired-mode'"))) - ((and (derived-mode-p 'log-view-mode) - (setq backend (vc-responsible-backend default-directory))) - (list backend default-directory)) ((setq backend (vc-backend buffer-file-name)) (if state-model-only-files (list backend (list buffer-file-name) @@ -1044,6 +1041,9 @@ BEWARE: this function may change the current buffer." (progn ;FIXME: Why not `with-current-buffer'? --Stef. (set-buffer vc-parent-buffer) (vc-deduce-fileset observer allow-unregistered state-model-only-files))) + ((and (derived-mode-p 'log-view-mode) + (setq backend (vc-responsible-backend default-directory))) + (list backend nil)) ((not buffer-file-name) (error "Buffer %s is not associated with a file" (buffer-name))) ((and allow-unregistered (not (vc-registered buffer-file-name))) -- 2.39.5