[Emacs-diffs] /srv/bzr/emacs/emacs-23 r99753: Fix to vc-hg-annotate-extract-revision-at-line (Bug#5960).

[Chong Yidong]

------------------------------------------------------------
revno: 99753
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Fri 2010-04-16 20:28:19 -0400
message:
  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).
modified:
  lisp/ChangeLog
  lisp/vc-hg.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-04-16 02:39:22 +0000
+++ b/lisp/ChangeLog    2010-04-17 00:28:19 +0000
@@ -1,3 +1,8 @@
+2010-04-17  Magnus Henoch  <address@hidden>
+
+       * 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  <address@hidden>
 
        * vc-git.el (vc-git-print-log): Doc fix.

=== modified file 'lisp/vc-hg.el'
--- a/lisp/vc-hg.el     2010-01-13 08:35:10 +0000
+++ b/lisp/vc-hg.el     2010-04-17 00:28:19 +0000
@@ -340,7 +340,8 @@
       (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))))