From: Dan Nicolaescu <dann@ics.uci.edu>
Date: Sat, 17 May 2008 17:07:46 +0000 (+0000)
Subject: (vc-annotate-show-diff-revision-at-line): Change
X-Git-Tag: emacs-pretest-23.0.90~5469
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4f155125f1b175821e3cf1f728243935f0830aa4;p=emacs.git

(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 d0925cb462a..26f4a1df0d7 100644
--- 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 73f0f8a013a..c973cf7057d 100644
--- 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*"))))))