diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2010-03-07 09:45:53 -0500 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2010-03-07 09:45:53 -0500 |
| commit | 1c465a6a67c09f05045d2bdcd60f722f0ccc57e4 (patch) | |
| tree | c4ad4c03dd7e7f8b83b781feed5d6da716b1b5e7 | |
| parent | 300ad19d4315183cf926ec6554d4bba4b79fa57a (diff) | |
| download | emacs-1c465a6a67c09f05045d2bdcd60f722f0ccc57e4.tar.gz | |
Correct pathname for vc-git-annotate-extract-revision-at-line (Bug#5657)
* vc-git.el (vc-git-annotate-extract-revision-at-line): Use
vc-git-root as default direcotry for revision path (Bug#5657).
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/vc-git.el | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d3692e6ac7f..b6374989031 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2010-03-07 Štěpán Němec <stepnem@gmail.com> (tiny change) + + * vc-git.el (vc-git-annotate-extract-revision-at-line): Use + vc-git-root as default direcotry for revision path (Bug#5657). + 2010-03-06 Chong Yidong <cyd@stupidchicken.com> * calculator.el (calculator): Don't bind split-window-keep-point diff --git a/lisp/vc-git.el b/lisp/vc-git.el index d645a4c05ba..9362ad743ee 100644 --- a/lisp/vc-git.el +++ b/lisp/vc-git.el @@ -703,7 +703,8 @@ or BRANCH^ (where \"^\" can be repeated)." (when (looking-at "\\([0-9a-f^][0-9a-f]+\\) \\(\\([^(]+\\) \\)?") (let ((revision (match-string-no-properties 1))) (if (match-beginning 2) - (cons revision (expand-file-name (match-string-no-properties 3))) + (cons revision (expand-file-name (match-string-no-properties 3) + (vc-git-root default-directory))) revision))))) ;;; TAG SYSTEM |