summaryrefslogtreecommitdiff
path: root/src/regexp.h
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-06-17 18:44:21 +0200
committerBram Moolenaar <Bram@vim.org>2017-06-17 18:44:21 +0200
commitfbd0b0af6800f6ff89857863d6a07ea03f09ff6c (patch)
treed970232ff584511e30efcfe2f7ea5eefb9e9f8d4 /src/regexp.h
parent8cf91286ca46a501d24e4b7d631b193256782c88 (diff)
downloadvim-git-fbd0b0af6800f6ff89857863d6a07ea03f09ff6c.tar.gz
patch 8.0.0643: when a pattern search is slow Vim becomes unusablev8.0.0643
Problem: When 'hlsearch' is set and matching with the last search pattern is very slow, Vim becomes unusable. Cannot quit search by pressing CTRL-C. Solution: When the search times out set a flag and don't try again. Check for timeout and CTRL-C in NFA loop that adds states.
Diffstat (limited to 'src/regexp.h')
-rw-r--r--src/regexp.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/regexp.h b/src/regexp.h
index 79c1e7d82..a3526e697 100644
--- a/src/regexp.h
+++ b/src/regexp.h
@@ -165,8 +165,8 @@ struct regengine
{
regprog_T *(*regcomp)(char_u*, int);
void (*regfree)(regprog_T *);
- int (*regexec_nl)(regmatch_T*, char_u*, colnr_T, int);
- long (*regexec_multi)(regmmatch_T*, win_T*, buf_T*, linenr_T, colnr_T, proftime_T*);
+ int (*regexec_nl)(regmatch_T *, char_u *, colnr_T, int);
+ long (*regexec_multi)(regmmatch_T *, win_T *, buf_T *, linenr_T, colnr_T, proftime_T *, int *);
char_u *expr;
};