From: Dan Nicolaescu Date: Tue, 22 Jun 2010 02:08:55 +0000 (-0700) Subject: Fix vc-annotate-show-changeset-diff-revision-at-line for git. X-Git-Tag: emacs-pretest-23.2.90~139^2~109 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c4786d60fecb2fa6a8a7c7785032ebefddc974a8;p=emacs.git 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 7474fcf866f..7aaeb51739d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2010-06-22 Dan Nicolaescu + + 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 Fix finding revisions in for renamed files in vc-annotate. diff --git a/lisp/vc-annotate.el b/lisp/vc-annotate.el index c372cb9922e..ffc11953903 100644 --- 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