* lisp/vc/vc-hg.el (vc-hg-annotate-re): Disallow ": " in file names.

Fixes: debbugs:14216
This commit is contained in:
Stefan Monnier
2013-04-16 20:50:44 -04:00
parent 7ce5be5461
commit 2d3fa3e502
2 changed files with 6 additions and 1 deletions

View File

@@ -1,3 +1,8 @@
2013-04-17 Stefan Monnier <monnier@iro.umontreal.ca>
* vc/vc-hg.el (vc-hg-annotate-re): Disallow ": " in file names
(bug#14216).
2013-04-17 Jean-Philippe Gravel <jpgravel@gmail.com>
* progmodes/gdb-mi.el (gdbmi-bnf-incomplete-record-result):

View File

@@ -357,7 +357,7 @@ Optional arg REVISION is a revision to annotate from."
;;215 Wed Jun 20 21:22:58 2007 -0700 foo.c: CONTENTS
;; i.e. VERSION_NUMBER DATE FILENAME: CONTENTS
(defconst vc-hg-annotate-re
"^[ \t]*\\([0-9]+\\) \\(.\\{30\\}\\)\\(?:\\(: \\)\\|\\(?: +\\(.+\\): \\)\\)")
"^[ \t]*\\([0-9]+\\) \\(.\\{30\\}\\)\\(?:\\(: \\)\\|\\(?: +\\([^:\n]+\\(?::\\(?:[^: \n][^:\n]*\\)?\\)*\\): \\)\\)")
(defun vc-hg-annotate-time ()
(when (looking-at vc-hg-annotate-re)