From: Chong Yidong <cyd@stupidchicken.com>
Date: Sat, 17 Apr 2010 00:28:19 +0000 (-0400)
Subject: Fix to vc-hg-annotate-extract-revision-at-line (Bug#5960).
X-Git-Tag: emacs-pretest-23.1.96~10
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8507c65c5f73f1e8029000cea70e91ce1d2da8e6;p=emacs.git

Fix to vc-hg-annotate-extract-revision-at-line (Bug#5960).

* vc-hg.el (vc-hg-annotate-extract-revision-at-line): Expand file
name relative to the project root (Bug#5960).
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fc9c4719045..8c0fbc4c143 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-17  Magnus Henoch  <magnus.henoch@gmail.com>
+
+	* vc-hg.el (vc-hg-annotate-extract-revision-at-line): Expand file
+	name relative to the project root (Bug#5960).
+
 2010-04-16  Glenn Morris  <rgm@gnu.org>
 
 	* vc-git.el (vc-git-print-log): Doc fix.
diff --git a/lisp/vc-hg.el b/lisp/vc-hg.el
index b6e1d39c2ff..ca83b7edf2f 100644
--- a/lisp/vc-hg.el
+++ b/lisp/vc-hg.el
@@ -340,7 +340,8 @@ Optional arg REVISION is a revision to annotate from."
       (if (match-beginning 3)
 	  (match-string-no-properties 1)
 	(cons (match-string-no-properties 1)
-	      (expand-file-name (match-string-no-properties 4)))))))
+	      (expand-file-name (match-string-no-properties 4)
+				(vc-hg-root default-directory)))))))
 
 (defun vc-hg-previous-revision (file rev)
   (let ((newrev (1- (string-to-number rev))))