diff options
| author | Dan Nicolaescu | 2010-06-21 19:08:55 -0700 |
|---|---|---|
| committer | Dan Nicolaescu | 2010-06-21 19:08:55 -0700 |
| commit | c4786d60fecb2fa6a8a7c7785032ebefddc974a8 (patch) | |
| tree | d9960d668bea06cc9abb8c44ab5f2afefd3b0fa9 /lisp/vc-annotate.el | |
| parent | 04ec0963f662150746408ff3f9c085240f83bb54 (diff) | |
| download | emacs-c4786d60fecb2fa6a8a7c7785032ebefddc974a8.tar.gz emacs-c4786d60fecb2fa6a8a7c7785032ebefddc974a8.zip | |
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)
Diffstat (limited to 'lisp/vc-annotate.el')
| -rw-r--r-- | lisp/vc-annotate.el | 2 |
1 files changed, 1 insertions, 1 deletions
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 ." | |||
| 526 | (message "Cannot extract revision number from the current line") | 526 | (message "Cannot extract revision number from the current line") |
| 527 | (setq prev-rev | 527 | (setq prev-rev |
| 528 | (vc-call-backend vc-annotate-backend 'previous-revision | 528 | (vc-call-backend vc-annotate-backend 'previous-revision |
| 529 | fname rev)) | 529 | (if filediff fname nil) rev)) |
| 530 | (if (not prev-rev) | 530 | (if (not prev-rev) |
| 531 | (message "Cannot diff from any revision prior to %s" rev) | 531 | (message "Cannot diff from any revision prior to %s" rev) |
| 532 | (save-window-excursion | 532 | (save-window-excursion |