Mercurial > emacs
changeset 106988:05efa1881381
(vc-annotate-revision-at-line): Compare file
names too.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Mon, 25 Jan 2010 01:04:59 -0800 |
| parents | 7362dc093e43 |
| children | 69a56b685af8 7ff0e7bb7142 |
| files | lisp/ChangeLog lisp/vc-annotate.el |
| diffstat | 2 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Jan 25 08:46:15 2010 +0100 +++ b/lisp/ChangeLog Mon Jan 25 01:04:59 2010 -0800 @@ -1,5 +1,8 @@ 2010-01-25 Dan Nicolaescu <dann@ics.uci.edu> + * vc-annotate.el (vc-annotate-revision-at-line): Compare file + names too. + * vc-bzr.el (vc-bzr-print-log): Use the more compact --line option for the short log. (vc-bzr-log-view-mode): Adjust regexp for the above change.
--- a/lisp/vc-annotate.el Mon Jan 25 08:46:15 2010 +0100 +++ b/lisp/vc-annotate.el Mon Jan 25 01:04:59 2010 -0800 @@ -447,7 +447,8 @@ (let ((rev-at-line (vc-annotate-extract-revision-at-line))) (if (not rev-at-line) (message "Cannot extract revision number from the current line") - (if (equal (car rev-at-line) vc-annotate-parent-rev) + (if (and (equal (car rev-at-line) vc-annotate-parent-rev) + (string= (cdr rev-at-line) vc-annotate-parent-file)) (message "Already at revision %s" rev-at-line) (vc-annotate-warp-revision (car rev-at-line) (cdr rev-at-line)))))))