(vc-annotate-show-diff-revision-at-line): Change

vc-diff-internal arg to match what vc-deduce-fileseset returns now.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d0925cb462a7b1eb2fbf77de0a210d58141561a4..26f4a1df0d75fb0722105adf0870d177cf4649ab 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-17  Dan Nicolaescu  <dann@rosas>
+
+       * vc.el (vc-annotate-show-diff-revision-at-line): Change
+       vc-diff-internal arg to match what vc-deduce-fileseset returns now.
+
 2008-05-17  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
 
        * menu-bar.el (menu-bar-select-buffer): Reinsert it as msb.el use it.

diff --git a/lisp/vc.el b/lisp/vc.el
index 73f0f8a013af715833ff7b28587a394c064f99cb..c973cf7057d7479ee1ca2c98fce4ab15521ee10d 100644 (file)
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -1788,7 +1788,7 @@ See Info node `Merging'."
 ;; VC status implementation
 
 (defun vc-default-status-extra-headers (backend dir)
-  ;; Be loud by default to remind people to add coded to display
+  ;; Be loud by default to remind people to add code to display
   ;; backend specific headers.
   ;; XXX: change this to return nil before the release.
   "Extra      : Add backend specific headers here")
@@ -3103,7 +3103,10 @@ revisions after."
          (save-window-excursion
            (vc-diff-internal
             nil
-            (cons vc-annotate-backend (list vc-annotate-parent-file))
+            ;; The value passed here should follow what
+            ;; `vc-deduce-fileset' returns.
+            (cons vc-annotate-backend
+                  (cons (list vc-annotate-parent-file) nil))
             prev-rev rev-at-line))
          (switch-to-buffer "*vc-diff*"))))))