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 fc9c471..8c0fbc4 100644 (file)
--- 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 b6e1d39..ca83b7e 100644 (file)
--- 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))))