summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2012-09-05 15:03:30 +0200
committerBram Moolenaar <Bram@vim.org>2012-09-05 15:03:30 +0200
commitb4a80cdd913605eefb26d6f091a386a4af0ac048 (patch)
treedb5451d3afabc0edc92063e725516a9d8475fbf9
parent7c82130a76898999bcebf28c71f0897644822fab (diff)
downloadvim-git-b4a80cdd913605eefb26d6f091a386a4af0ac048.tar.gz
updated for version 7.3.650v7.3.650
Problem: Completion after ":help \{-" gives an error message and messes up the command line. Solution: Cancel the tag search if the pattern can't be compiled. (Yasuhiro Matsumoto)
-rw-r--r--src/tag.c2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/tag.c b/src/tag.c
index 08abd4175..4f2426b90 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -1443,6 +1443,8 @@ find_tags(pat, num_matches, matchesp, flags, mincount, buf_ffname)
orgpat.len = p_tl;
prepare_pats(&orgpat, has_re);
+ if (has_re && orgpat.regmatch.regprog == NULL)
+ goto findtag_end;
#ifdef FEAT_TAG_BINS
/* This is only to avoid a compiler warning for using search_info
diff --git a/src/version.c b/src/version.c
index 4b4890c7e..a2ca2386e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -720,6 +720,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 650,
+/**/
649,
/**/
648,