Skip to content

Commit 69b8442

Browse files
committed
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.
1 parent a2c2581 commit 69b8442

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

src/tag.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1326,6 +1326,7 @@ find_tags(pat, num_matches, matchesp, flags, mincount, buf_ffname)
13261326
int match_no_ic = 0;/* matches with rm_ic == FALSE */
13271327
int match_re; /* match with regexp */
13281328
int matchoff = 0;
1329+
int save_emsg_off;
13291330

13301331
#ifdef FEAT_EMACS_TAGS
13311332
/*
@@ -1442,7 +1443,10 @@ find_tags(pat, num_matches, matchesp, flags, mincount, buf_ffname)
14421443
if (p_tl != 0 && orgpat.len > p_tl) /* adjust for 'taglength' */
14431444
orgpat.len = p_tl;
14441445

1446+
save_emsg_off = emsg_off;
1447+
emsg_off = TRUE; /* don't want error for invalid RE here */
14451448
prepare_pats(&orgpat, has_re);
1449+
emsg_off = save_emsg_off;
14461450
if (has_re && orgpat.regmatch.regprog == NULL)
14471451
goto findtag_end;
14481452

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -738,6 +738,8 @@ static char *(features[]) =
738738

739739
static int included_patches[] =
740740
{ /* Add new patch number below this line */
741+
/**/
742+
105,
741743
/**/
742744
104,
743745
/**/

0 commit comments

Comments
 (0)