aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorJuri Linkov2020-06-24 02:54:30 +0300
committerJuri Linkov2020-06-24 02:54:30 +0300
commit4e04ca847fc04ad0b2845143e0788485de0ed997 (patch)
tree4a9c7275c1213c5994723a0f2ee09e2c8ab423ee /lisp
parent35e881c5303c6ddf23b901bd2805971dc4ecf20b (diff)
downloademacs-4e04ca847fc04ad0b2845143e0788485de0ed997.tar.gz
emacs-4e04ca847fc04ad0b2845143e0788485de0ed997.zip
More not-state-changing vc commands can be used from non-file buffers
* lisp/vc/vc.el (vc-deduce-fileset): Instead of checking for log-view-mode, check for '(not buffer-file-name)' before trying to get the backend for default-directory. Remove the branch that checks for '(not buffer-file-name)' and signals the error because vc-responsible-backend used in previous condition already signals its error. (Bug#41974)
Diffstat (limited to 'lisp')
-rw-r--r--lisp/vc/vc.el4
1 files changed, 1 insertions, 3 deletions
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."
1074 (progn ;FIXME: Why not `with-current-buffer'? --Stef. 1074 (progn ;FIXME: Why not `with-current-buffer'? --Stef.
1075 (set-buffer vc-parent-buffer) 1075 (set-buffer vc-parent-buffer)
1076 (vc-deduce-fileset not-state-changing allow-unregistered state-model-only-files))) 1076 (vc-deduce-fileset not-state-changing allow-unregistered state-model-only-files)))
1077 ((and (derived-mode-p 'log-view-mode) 1077 ((and (not buffer-file-name)
1078 (setq backend (vc-responsible-backend default-directory))) 1078 (setq backend (vc-responsible-backend default-directory)))
1079 (list backend nil)) 1079 (list backend nil))
1080 ((not buffer-file-name)
1081 (error "Buffer %s is not associated with a file" (buffer-name)))
1082 ((and allow-unregistered (not (vc-registered buffer-file-name))) 1080 ((and allow-unregistered (not (vc-registered buffer-file-name)))
1083 (if state-model-only-files 1081 (if state-model-only-files
1084 (list (vc-backend-for-registration (buffer-file-name)) 1082 (list (vc-backend-for-registration (buffer-file-name))