diff options
| author | Stefan Monnier | 2013-04-16 20:50:44 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2013-04-16 20:50:44 -0400 |
| commit | 2d3fa3e5020daec5efb00b2b03a9c4022e79e729 (patch) | |
| tree | ad956953d2234ff4e34c261f67354a726b2e4354 /lisp/vc | |
| parent | 7ce5be546101bb1b93856125487a3a6e6c9cd854 (diff) | |
| download | emacs-2d3fa3e5020daec5efb00b2b03a9c4022e79e729.tar.gz emacs-2d3fa3e5020daec5efb00b2b03a9c4022e79e729.zip | |
* lisp/vc/vc-hg.el (vc-hg-annotate-re): Disallow ": " in file names.
Fixes: debbugs:14216
Diffstat (limited to 'lisp/vc')
| -rw-r--r-- | lisp/vc/vc-hg.el | 2 |
1 files changed, 1 insertions, 1 deletions
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." | |||
| 357 | ;;215 Wed Jun 20 21:22:58 2007 -0700 foo.c: CONTENTS | 357 | ;;215 Wed Jun 20 21:22:58 2007 -0700 foo.c: CONTENTS |
| 358 | ;; i.e. VERSION_NUMBER DATE FILENAME: CONTENTS | 358 | ;; i.e. VERSION_NUMBER DATE FILENAME: CONTENTS |
| 359 | (defconst vc-hg-annotate-re | 359 | (defconst vc-hg-annotate-re |
| 360 | "^[ \t]*\\([0-9]+\\) \\(.\\{30\\}\\)\\(?:\\(: \\)\\|\\(?: +\\(.+\\): \\)\\)") | 360 | "^[ \t]*\\([0-9]+\\) \\(.\\{30\\}\\)\\(?:\\(: \\)\\|\\(?: +\\([^:\n]+\\(?::\\(?:[^: \n][^:\n]*\\)?\\)*\\): \\)\\)") |
| 361 | 361 | ||
| 362 | (defun vc-hg-annotate-time () | 362 | (defun vc-hg-annotate-time () |
| 363 | (when (looking-at vc-hg-annotate-re) | 363 | (when (looking-at vc-hg-annotate-re) |