diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-06-18 22:41:03 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-06-18 22:41:03 +0200 |
| commit | 06f1ed2f78c5c03af95054fc3a8665df39dec362 (patch) | |
| tree | 413bd7310eafa3df68daf706d304ce4ae452b311 /src/regexp.c | |
| parent | 0946326580e6f034fe2c88d041407ea0fde980ab (diff) | |
| download | vim-git-06f1ed2f78c5c03af95054fc3a8665df39dec362.tar.gz | |
patch 8.0.0647: syntax highlighting can make cause a freezev8.0.0647
Problem: Syntax highlighting can make cause a freeze.
Solution: Apply 'redrawtime' to syntax highlighting, per window.
Diffstat (limited to 'src/regexp.c')
| -rw-r--r-- | src/regexp.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/regexp.c b/src/regexp.c index e13061fd3..c4745ce7a 100644 --- a/src/regexp.c +++ b/src/regexp.c @@ -5756,8 +5756,6 @@ regmatch( printf("Premature EOL\n"); #endif } - if (status == RA_FAIL) - got_int = TRUE; return (status == RA_MATCH); } @@ -8224,8 +8222,6 @@ report_re_switch(char_u *pat) } #endif -static int vim_regexec_both(regmatch_T *rmp, char_u *line, colnr_T col, int nl); - /* * Match a regexp against a string. * "rmp->regprog" is a compiled regexp as returned by vim_regcomp(). @@ -8236,7 +8232,7 @@ static int vim_regexec_both(regmatch_T *rmp, char_u *line, colnr_T col, int nl); * Return TRUE if there is a match, FALSE if not. */ static int -vim_regexec_both( +vim_regexec_string( regmatch_T *rmp, char_u *line, /* string to match against */ colnr_T col, /* column to start looking for match */ @@ -8299,12 +8295,12 @@ vim_regexec_prog( char_u *line, colnr_T col) { - int r; - regmatch_T regmatch; + int r; + regmatch_T regmatch; regmatch.regprog = *prog; regmatch.rm_ic = ignore_case; - r = vim_regexec_both(®match, line, col, FALSE); + r = vim_regexec_string(®match, line, col, FALSE); *prog = regmatch.regprog; return r; } @@ -8316,7 +8312,7 @@ vim_regexec_prog( int vim_regexec(regmatch_T *rmp, char_u *line, colnr_T col) { - return vim_regexec_both(rmp, line, col, FALSE); + return vim_regexec_string(rmp, line, col, FALSE); } #if defined(FEAT_MODIFY_FNAME) || defined(FEAT_EVAL) \ @@ -8329,7 +8325,7 @@ vim_regexec(regmatch_T *rmp, char_u *line, colnr_T col) int vim_regexec_nl(regmatch_T *rmp, char_u *line, colnr_T col) { - return vim_regexec_both(rmp, line, col, TRUE); + return vim_regexec_string(rmp, line, col, TRUE); } #endif |