diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2010-01-25 01:04:59 -0800 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2010-01-25 01:04:59 -0800 |
| commit | e2396d80cbf7e9d20c05eff44c1c8f04ecb9341c (patch) | |
| tree | 472ed183cd4479954a67bf6199a8d967fefede11 | |
| parent | 433bdc96cb7234e36f218df1588b17411f54ee57 (diff) | |
| download | emacs-e2396d80cbf7e9d20c05eff44c1c8f04ecb9341c.tar.gz | |
(vc-annotate-revision-at-line): Compare file
names too.
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/vc-annotate.el | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6e86aa2a94a..6af0ffdf5a3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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. diff --git a/lisp/vc-annotate.el b/lisp/vc-annotate.el index 9f8daad0fde..71839443553 100644 --- a/lisp/vc-annotate.el +++ b/lisp/vc-annotate.el @@ -447,7 +447,8 @@ Return a cons (REV . FILENAME)." (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))))))) |