1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-24 07:20:37 +00:00

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)
This commit is contained in:
Dan Nicolaescu 2010-06-21 19:08:55 -07:00
parent 04ec0963f6
commit c4786d60fe
2 changed files with 8 additions and 1 deletions

View File

@ -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.

View File

@ -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