2 files changed, 14 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5f50546468b..1fda3acf555 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-07  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        Fix default-directory for vc-root-diff.
+        * vc.el (vc-root-diff): Bind default-directory to the root
+        directory for the diff command.
+
 2010-04-07  Michael McNamara  <mac@mail.brushroad.com>
 
         * verilog-mode.el (verilog-forward-sexp, verilog-calc-1): Support
diff --git a/lisp/vc.el b/lisp/vc.el
index 142a1508162..aef5fad12e1 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -1642,9 +1642,14 @@ saving the buffer."
         (error "Buffer is not version controlled"))
       (setq rootdir (vc-call-backend backend 'root default-directory))
       (setq working-revision (vc-working-revision rootdir))
-      (vc-diff-internal
-       t (list backend (list rootdir) working-revision) nil nil
-       (called-interactively-p 'interactive)))))
+      ;; VC diff for the root directory produces output that is
+      ;; relative to it.  Bind default-directory to the root directory
+      ;; here, this way the *vc-diff* buffer is setup correctly, so
+      ;; relative file names work.
+      (let ((default-directory rootdir))
+        (vc-diff-internal
+         t (list backend (list rootdir) working-revision) nil nil
+         (called-interactively-p 'interactive))))))
 
 ;;;###autoload
 (defun vc-revision-other-window (rev)