[Emacs-diffs] emacs-25 3c5989d: Prioritize looking inside vc-parent-buffer over log-view-mode fallback

[Dmitry Gutov]

branch: emacs-25
commit 3c5989da748f1a9aae83303291ef07d29202a139
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>

    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 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 0edbc94..8d72a36 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)))