# HG changeset patch # User Chong Yidong # Date 1271464099 14400 # Node ID 62fa87a581e19d179dd003687255908512625f59 # Parent 3222c3374fe9b42d21cf4f43f907473cf58ab96c 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 -r 3222c3374fe9 -r 62fa87a581e1 lisp/ChangeLog --- a/lisp/ChangeLog Fri Apr 16 00:43:29 2010 -0700 +++ b/lisp/ChangeLog Fri Apr 16 20:28:19 2010 -0400 @@ -1,3 +1,8 @@ +2010-04-17 Magnus Henoch + + * 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 * vc-git.el (vc-git-print-log): Doc fix. diff -r 3222c3374fe9 -r 62fa87a581e1 lisp/vc-hg.el --- a/lisp/vc-hg.el Fri Apr 16 00:43:29 2010 -0700 +++ b/lisp/vc-hg.el Fri Apr 16 20:28:19 2010 -0400 @@ -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))))