diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2010-04-16 20:28:19 -0400 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2010-04-16 20:28:19 -0400 |
| commit | 8507c65c5f73f1e8029000cea70e91ce1d2da8e6 (patch) | |
| tree | c3df12e342d0b98a412bdebd6199f40198c45f12 | |
| parent | d52dbd3d45804baa4645ee14cfe2176e2b6acee3 (diff) | |
| download | emacs-8507c65c5f73f1e8029000cea70e91ce1d2da8e6.tar.gz | |
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).
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/vc-hg.el | 3 |
2 files changed, 7 insertions, 1 deletions
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)))) |