(vc-annotate-revision-at-line): Compare file

names too.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6e86aa2a94aca00b4ad09c7efc461e6d8a2b3ed7..6af0ffdf5a3c08159f38c090761403c1e51476ae 100644 (file)
--- 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 9f8daad0fde920070632d317987fcd16ee6f1d03..71839443553ce1b7a9bff2054847a639ac998f91 100644 (file)
--- 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)))))))