Fix vc-annotate-show-changeset-diff-revision-at-line for git.

* lisp/vc-annotate.el (vc-annotate-show-diff-revision-at-line-internal):
Do not pass the file name to the 'previous-revision call when we
don't want a file diff.  (Bug#6489)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7474fcf866fd3ba83d4a00d18df03c8d7b3bb5b4..7aaeb51739d96e1426788354ab39d9327920a67b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-22  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       Fix vc-annotate-show-changeset-diff-revision-at-line for git.
+       * vc-annotate.el (vc-annotate-show-diff-revision-at-line-internal):
+       Do not pass the file name to the 'previous-revision call when we
+       don't want a file diff.  (Bug#6489)
+
 2010-06-21  Dan Nicolaescu  <dann@ics.uci.edu>
 
        Fix finding revisions in for renamed files in vc-annotate.

diff --git a/lisp/vc-annotate.el b/lisp/vc-annotate.el
index c372cb9922e9c636a9cfdb1e8c526e72888a13e0..ffc119539031ef02e8b8824346b1d071fad80760 100644 (file)
--- a/lisp/vc-annotate.el
+++ b/lisp/vc-annotate.el
@@ -526,7 +526,7 @@ the file in question, search for the log entry required and move point ."
          (message "Cannot extract revision number from the current line")
        (setq prev-rev
              (vc-call-backend vc-annotate-backend 'previous-revision
-                               fname rev))
+                               (if filediff fname nil) rev))
        (if (not prev-rev)
            (message "Cannot diff from any revision prior to %s" rev)
          (save-window-excursion