summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/tag.c4
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/src/tag.c b/src/tag.c
index e7ea52a29..be80a1165 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -1326,6 +1326,7 @@ find_tags(pat, num_matches, matchesp, flags, mincount, buf_ffname)
int match_no_ic = 0;/* matches with rm_ic == FALSE */
int match_re; /* match with regexp */
int matchoff = 0;
+ int save_emsg_off;
#ifdef FEAT_EMACS_TAGS
/*
@@ -1442,7 +1443,10 @@ find_tags(pat, num_matches, matchesp, flags, mincount, buf_ffname)
if (p_tl != 0 && orgpat.len > p_tl) /* adjust for 'taglength' */
orgpat.len = p_tl;
+ save_emsg_off = emsg_off;
+ emsg_off = TRUE; /* don't want error for invalid RE here */
prepare_pats(&orgpat, has_re);
+ emsg_off = save_emsg_off;
if (has_re && orgpat.regmatch.regprog == NULL)
goto findtag_end;
diff --git a/src/version.c b/src/version.c
index 02c659e70..c5c7fd458 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 105,
+/**/
104,
/**/
103,