[Emacs-diffs] /srv/bzr/emacs/trunk r99384: (vc-annotate-revision-at-line): Compare file

[Dan Nicolaescu]

------------------------------------------------------------
revno: 99384
committer: Dan Nicolaescu <address@hidden>
branch nick: trunk
timestamp: Mon 2010-01-25 01:04:59 -0800
message:
  (vc-annotate-revision-at-line): Compare file
  names too.
modified:
  lisp/ChangeLog
  lisp/vc-annotate.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-01-25 06:03:23 +0000
+++ b/lisp/ChangeLog    2010-01-25 09:04:59 +0000
@@ -1,5 +1,8 @@
 2010-01-25  Dan Nicolaescu  <address@hidden>
 
+       * 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.

=== modified file 'lisp/vc-annotate.el'
--- a/lisp/vc-annotate.el       2010-01-13 08:35:10 +0000
+++ b/lisp/vc-annotate.el       2010-01-25 09:04:59 +0000
@@ -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)))))))