mirror of
https://github.com/vim/vim.git
synced 2025-07-26 11:04:33 -04:00
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.
This commit is contained in:
parent
174a848b67
commit
dff54ac7e8
@ -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_no_ic = 0;/* matches with rm_ic == FALSE */
|
||||||
int match_re; /* match with regexp */
|
int match_re; /* match with regexp */
|
||||||
int matchoff = 0;
|
int matchoff = 0;
|
||||||
|
int save_emsg_off;
|
||||||
|
|
||||||
#ifdef FEAT_EMACS_TAGS
|
#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' */
|
if (p_tl != 0 && orgpat.len > p_tl) /* adjust for 'taglength' */
|
||||||
orgpat.len = p_tl;
|
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);
|
prepare_pats(&orgpat, has_re);
|
||||||
|
emsg_off = save_emsg_off;
|
||||||
if (has_re && orgpat.regmatch.regprog == NULL)
|
if (has_re && orgpat.regmatch.regprog == NULL)
|
||||||
goto findtag_end;
|
goto findtag_end;
|
||||||
|
|
||||||
|
@ -738,6 +738,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
105,
|
||||||
/**/
|
/**/
|
||||||
104,
|
104,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user