[Emacs-diffs] /srv/bzr/emacs/emacs-23 r99873: Fix vc-annotate-show-changeset-diff-revision-at-line for git.

[Dan Nicolaescu]

------------------------------------------------------------
revno: 99873
committer: Dan Nicolaescu <address@hidden>
branch nick: emacs-23
timestamp: Mon 2010-06-21 19:08:55 -0700
message:
  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)
modified:
  lisp/ChangeLog
  lisp/vc-annotate.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-06-22 01:26:30 +0000
+++ b/lisp/ChangeLog    2010-06-22 02:08:55 +0000
@@ -1,3 +1,10 @@
+2010-06-22  Dan Nicolaescu  <address@hidden>
+
+       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  <address@hidden>
 
        Fix finding revisions in for renamed files in vc-annotate.

=== modified file 'lisp/vc-annotate.el'
--- a/lisp/vc-annotate.el       2010-06-22 01:26:30 +0000
+++ b/lisp/vc-annotate.el       2010-06-22 02:08:55 +0000
@@ -526,7 +526,7 @@
          (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