diff options
| author | Dmitry Gutov | 2013-11-25 04:28:02 +0200 |
|---|---|---|
| committer | Dmitry Gutov | 2013-11-25 04:28:02 +0200 |
| commit | 6f20dd038e1ead5741a41001efc86cca63c0cf2e (patch) | |
| tree | c4042ef4f708cb79e9e2c20f547b77c6b5d10a4d | |
| parent | 1bb1b50d19ce9b39cdb2d4366333e38268536abb (diff) | |
| download | emacs-6f20dd038e1ead5741a41001efc86cca63c0cf2e.tar.gz emacs-6f20dd038e1ead5741a41001efc86cca63c0cf2e.zip | |
* lisp/vc/vc-git.el (vc-git-annotate-extract-revision-at-line): Make it
work when annotation is invisible.
Fixes: debbugs:13886
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/vc/vc-git.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 349d12225fc..f2d2f732222 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-11-25 Dmitry Gutov <dgutov@yandex.ru> | ||
| 2 | |||
| 3 | * vc/vc-git.el (vc-git-annotate-extract-revision-at-line): Make it | ||
| 4 | work when annotation is invisible (Bug#13886). | ||
| 5 | |||
| 1 | 2013-11-24 Simon Schubert <2@0x2c.org> (tiny change) | 6 | 2013-11-24 Simon Schubert <2@0x2c.org> (tiny change) |
| 2 | 7 | ||
| 3 | * json.el (json-alist-p): Only return non-nil if the alist has | 8 | * json.el (json-alist-p): Only return non-nil if the alist has |
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index fd5c91ef490..8acb23dfd6c 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el | |||
| @@ -931,7 +931,7 @@ or BRANCH^ (where \"^\" can be repeated)." | |||
| 931 | 931 | ||
| 932 | (defun vc-git-annotate-extract-revision-at-line () | 932 | (defun vc-git-annotate-extract-revision-at-line () |
| 933 | (save-excursion | 933 | (save-excursion |
| 934 | (move-beginning-of-line 1) | 934 | (beginning-of-line) |
| 935 | (when (looking-at "\\([0-9a-f^][0-9a-f]+\\) \\(\\([^(]+\\) \\)?") | 935 | (when (looking-at "\\([0-9a-f^][0-9a-f]+\\) \\(\\([^(]+\\) \\)?") |
| 936 | (let ((revision (match-string-no-properties 1))) | 936 | (let ((revision (match-string-no-properties 1))) |
| 937 | (if (match-beginning 2) | 937 | (if (match-beginning 2) |