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

Fixes: debbugs:14216

2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4a9c8cb22ec..de1121fa131 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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):
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index f39ef568e8b..033e78c20cd 100644
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -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)