From: Dan Nicolaescu <dann@ics.uci.edu>
Date: Mon, 25 Jan 2010 09:04:59 +0000 (-0800)
Subject: (vc-annotate-revision-at-line): Compare file
X-Git-Tag: emacs-pretest-23.1.92~29^2~2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e2396d80cbf7e9d20c05eff44c1c8f04ecb9341c;p=emacs.git

(vc-annotate-revision-at-line): Compare file
names too.
---

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)))))))