diff options
| -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 @@ | |||
| 1 | 2010-03-07 Štěpán Němec <stepnem@gmail.com> (tiny change) | ||
| 2 | |||
| 3 | * vc-git.el (vc-git-annotate-extract-revision-at-line): Use | ||
| 4 | vc-git-root as default direcotry for revision path (Bug#5657). | ||
| 5 | |||
| 1 | 2010-03-06 Chong Yidong <cyd@stupidchicken.com> | 6 | 2010-03-06 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 7 | ||
| 3 | * calculator.el (calculator): Don't bind split-window-keep-point | 8 | * 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)." | |||
| 703 | (when (looking-at "\\([0-9a-f^][0-9a-f]+\\) \\(\\([^(]+\\) \\)?") | 703 | (when (looking-at "\\([0-9a-f^][0-9a-f]+\\) \\(\\([^(]+\\) \\)?") |
| 704 | (let ((revision (match-string-no-properties 1))) | 704 | (let ((revision (match-string-no-properties 1))) |
| 705 | (if (match-beginning 2) | 705 | (if (match-beginning 2) |
| 706 | (cons revision (expand-file-name (match-string-no-properties 3))) | 706 | (cons revision (expand-file-name (match-string-no-properties 3) |
| 707 | (vc-git-root default-directory))) | ||
| 707 | revision))))) | 708 | revision))))) |
| 708 | 709 | ||
| 709 | ;;; TAG SYSTEM | 710 | ;;; TAG SYSTEM |