diff options
author | Billy Su <g4691821@gmail.com> | 2019-03-07 13:08:15 +0800 |
---|---|---|
committer | Billy Su <g4691821@gmail.com> | 2019-03-07 23:27:19 +0800 |
commit | 241b905b1378c5c45d8d284bb191b16807ff2a44 (patch) | |
tree | ce1726447334ae05c894b1b7bd59718058a12a32 /src/nvim/regexp_defs.h | |
parent | 5f84b1dc4154ea8def87b6113fa9b9ed058d83d2 (diff) | |
download | rneovim-241b905b1378c5c45d8d284bb191b16807ff2a44.tar.gz rneovim-241b905b1378c5c45d8d284bb191b16807ff2a44.tar.bz2 rneovim-241b905b1378c5c45d8d284bb191b16807ff2a44.zip |
vim-patch:8.0.0643: when a pattern search is slow Vim becomes unusable
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.
https://github.com/vim/vim/commit/fbd0b0af6800f6ff89857863d6a07ea03f09ff6c
Diffstat (limited to 'src/nvim/regexp_defs.h')
-rw-r--r-- | src/nvim/regexp_defs.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/regexp_defs.h b/src/nvim/regexp_defs.h index b5d56e07fc..298d82fc6b 100644 --- a/src/nvim/regexp_defs.h +++ b/src/nvim/regexp_defs.h @@ -156,11 +156,11 @@ struct reg_extmatch { }; struct regengine { - regprog_T *(*regcomp)(char_u*, int); + regprog_T *(*regcomp)(char_u *, int); void (*regfree)(regprog_T *); - int (*regexec_nl)(regmatch_T*, char_u*, colnr_T, bool); - long (*regexec_multi)(regmmatch_T*, win_T*, buf_T*, linenr_T, colnr_T, - proftime_T*); + int (*regexec_nl)(regmatch_T *, char_u *, colnr_T, bool); + long (*regexec_multi)(regmmatch_T *, win_T *, buf_T *, linenr_T, colnr_T, + proftime_T *, int *); char_u *expr; }; |