[Emacs-diffs] /srv/bzr/emacs/trunk r102364: * lisp/vc/vc.el (vc-deduce-backend): Use default-directory in shell-mode

[Stefan Monnier]

------------------------------------------------------------
revno: 102364
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Fri 2010-11-12 08:44:46 -0500
message:
  * lisp/vc/vc.el (vc-deduce-backend): Use default-directory in shell-mode
  and compilation-mode.
modified:
  lisp/ChangeLog
  lisp/vc/vc.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-11-12 13:35:36 +0000
+++ b/lisp/ChangeLog    2010-11-12 13:44:46 +0000
@@ -1,5 +1,8 @@
 2010-11-12  Stefan Monnier  <address@hidden>
 
+       * vc/vc.el (vc-deduce-backend): Use default-directory in shell-mode
+       and compilation-mode (bug#7350).
+
        * vc/smerge-mode.el (smerge-refine): Choose better default part to
        highlight when one of them is empty.
 

=== modified file 'lisp/vc/vc.el'
--- a/lisp/vc/vc.el     2010-11-09 20:07:10 +0000
+++ b/lisp/vc/vc.el     2010-11-12 13:44:46 +0000
@@ -920,7 +920,8 @@
   (cond ((derived-mode-p 'vc-dir-mode)   vc-dir-backend)
        ((derived-mode-p 'log-view-mode) log-view-vc-backend)
        ((derived-mode-p 'diff-mode)     diff-vc-backend)
-       ((derived-mode-p 'dired-mode)
+        ;; Maybe we could even use comint-mode rather than shell-mode?
+       ((derived-mode-p 'dired-mode 'shell-mode 'compilation-mode)
         (vc-responsible-backend default-directory))
        (vc-mode (vc-backend buffer-file-name))))
 
@@ -986,7 +987,7 @@
   (let ((backend (vc-responsible-backend default-directory)))
     (unless backend (error "Directory not under VC"))
     (list backend
-       (dired-map-over-marks (dired-get-filename nil t) nil))))
+          (dired-map-over-marks (dired-get-filename nil t) nil))))
 
 (defun vc-ensure-vc-buffer ()
   "Make sure that the current buffer visits a version-controlled file."