aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/vc
diff options
context:
space:
mode:
authorStefan Monnier2010-11-12 08:44:46 -0500
committerStefan Monnier2010-11-12 08:44:46 -0500
commitebff325e4317a1ff8d6a86976a2dc9f78697b21a (patch)
tree99898d68e1ab8e2f7998137a01992e39310a5888 /lisp/vc
parent4e9e1584fd08ee318589e70049dd22429fd7e9c3 (diff)
downloademacs-ebff325e4317a1ff8d6a86976a2dc9f78697b21a.tar.gz
emacs-ebff325e4317a1ff8d6a86976a2dc9f78697b21a.zip
* lisp/vc/vc.el (vc-deduce-backend): Use default-directory in shell-mode
and compilation-mode. Fixes: debbugs:7350
Diffstat (limited to 'lisp/vc')
-rw-r--r--lisp/vc/vc.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 665dafb10df..56bf353b6b4 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -920,7 +920,8 @@ Within directories, only files already under version control are noticed."
920 (cond ((derived-mode-p 'vc-dir-mode) vc-dir-backend) 920 (cond ((derived-mode-p 'vc-dir-mode) vc-dir-backend)
921 ((derived-mode-p 'log-view-mode) log-view-vc-backend) 921 ((derived-mode-p 'log-view-mode) log-view-vc-backend)
922 ((derived-mode-p 'diff-mode) diff-vc-backend) 922 ((derived-mode-p 'diff-mode) diff-vc-backend)
923 ((derived-mode-p 'dired-mode) 923 ;; Maybe we could even use comint-mode rather than shell-mode?
924 ((derived-mode-p 'dired-mode 'shell-mode 'compilation-mode)
924 (vc-responsible-backend default-directory)) 925 (vc-responsible-backend default-directory))
925 (vc-mode (vc-backend buffer-file-name)))) 926 (vc-mode (vc-backend buffer-file-name))))
926 927
@@ -986,7 +987,7 @@ current buffer."
986 (let ((backend (vc-responsible-backend default-directory))) 987 (let ((backend (vc-responsible-backend default-directory)))
987 (unless backend (error "Directory not under VC")) 988 (unless backend (error "Directory not under VC"))
988 (list backend 989 (list backend
989 (dired-map-over-marks (dired-get-filename nil t) nil)))) 990 (dired-map-over-marks (dired-get-filename nil t) nil))))
990 991
991(defun vc-ensure-vc-buffer () 992(defun vc-ensure-vc-buffer ()
992 "Make sure that the current buffer visits a version-controlled file." 993 "Make sure that the current buffer visits a version-controlled file."