procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

; Account for spaces before the filename

Browse source
This commit is contained in:
Dmitry Gutov 2016-01-10 04:38:34 +03:00
parent c71e1e86df
commit cca0f93359
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/vc/vc-hg.el
View file

@ -397,7 +397,7 @@ Optional arg REVISION is a revision to annotate from."
(concat
"^\\(?: *[^ ]+ +\\)?\\([0-9]+\\) " ;User and revision.
"\\([0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]\\)" ;Date.
"\\( [^:]+\\)?:")) ;Filename,
"\\(?: +\\([^:]+\\)\\)?:")) ;Filename.
(defun vc-hg-annotate-time ()
(when (looking-at vc-hg-annotate-re)
@ -415,7 +415,7 @@ Optional arg REVISION is a revision to annotate from."
(when (looking-at vc-hg-annotate-re)
(if (match-beginning 3)
(cons (match-string-no-properties 1)
(expand-file-name (substring (match-string-no-properties 3) 1)
(expand-file-name (match-string-no-properties 3)
(vc-hg-root default-directory)))
(match-string-no-properties 1)))))

2
test/automated/vc-hg.el
View file

@ -45,7 +45,7 @@
(ert-deftest vc-hg-annotate-extract-revision-at-line-with-both ()
(with-temp-buffer
(save-excursion (insert "philringnalda 218075 2014-11-28 CLOBBER:"))
(save-excursion (insert "philringnalda 218075 2014-11-28 CLOBBER:"))
(should (equal (vc-hg-annotate-extract-revision-at-line)
(cons
"218075"