2 files changed, 4 insertions, 3 deletions

diff --git a/etc/NEWS b/etc/NEWS
index d501c2ad872..32ceec1d362 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -173,6 +173,9 @@ directories with the help of new command 'dired-vc-next-action'.
 
 ** Change Logs and VC
 
+*** More vc commands that don't change VC state can be used from non-file buffers.
+Such non-file buffers should have default-directory under vc.
+
 *** New command 'vc-dir-root' uses the root directory without asking.
 
 *** New commands 'vc-dir-mark-registered-files' (bound to '* r') and
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 9b12d449785..65775f8e46e 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -1074,11 +1074,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 not-state-changing allow-unregistered state-model-only-files)))
-     ((and (derived-mode-p 'log-view-mode)
+     ((and (not buffer-file-name)
            (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)))
       (if state-model-only-files
           (list (vc-backend-for-registration (buffer-file-name))