thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.0035: saving and restoring called_emsg is clumsy

Browse Source 
Problem:    Saving and restoring called_emsg is clumsy.
Solution:   Count the number of error messages.
This commit is contained in:
Bram Moolenaar
2019-12-23 22:59:18 +01:00
parent 70188f5b23
commit 53989554a4
13 changed files with 32 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/highlight.c
View File

@@ -4055,7 +4055,7 @@ next_search_hl(
linenr_T l;
colnr_T matchcol;
long nmatched;
int save_called_emsg = called_emsg;
int called_emsg_before = called_emsg;
// for :{range}s/pat only highlight inside the range
if (lnum < search_first_line || lnum > search_last_line)
@@ -4081,7 +4081,6 @@ next_search_hl(
* Repeat searching for a match until one is found that includes "mincol"
* or none is found in this line.
*/
called_emsg = FALSE;
for (;;)
{
# ifdef FEAT_RELTIME
@@ -4143,7 +4142,7 @@ next_search_hl(
if (regprog_is_copy)
cur->match.regprog = cur->hl.rm.regprog;
if (called_emsg || got_int || timed_out)
if (called_emsg > called_emsg_before || got_int || timed_out)
{
// Error while handling regexp: stop using this regexp.
if (shl == search_hl)
@@ -4176,9 +4175,6 @@ next_search_hl(
break; // useful match found
}
}
// Restore called_emsg for assert_fails().
called_emsg = save_called_emsg;
}
/*