Mercurial > emacs
changeset 109253:a41a9e7bfad8
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)
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Mon, 21 Jun 2010 19:08:55 -0700 |
| parents | 64f9d1b2b73b |
| children | 827f21099a9d |
| files | lisp/ChangeLog lisp/vc-annotate.el |
| diffstat | 2 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Jun 21 18:26:30 2010 -0700 +++ b/lisp/ChangeLog Mon Jun 21 19:08:55 2010 -0700 @@ -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.
--- a/lisp/vc-annotate.el Mon Jun 21 18:26:30 2010 -0700 +++ b/lisp/vc-annotate.el Mon Jun 21 19:08:55 2010 -0700 @@ -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