updated for version 7.4.105

Problem:    Completing a tag pattern may give an error for invalid pattern.
Solution:   Suppress the error, just return no matches.

diff --git a/src/tag.c b/src/tag.c
index e7ea52a2930eb9c19d6a25143e257209f54c322a..be80a11651c64d6c8e5c87dfbc5a57c5c4601a5f 100644 (file)
--- 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 02c659e70d0ec55495fcf0aadc9b09db2f708388..c5c7fd45874398bafd0be4b6bec80d1188d84d28 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    105,
 /**/
     104,
 /**/