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/screen.c | |
| 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/screen.c')
| -rw-r--r-- | src/nvim/screen.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c index 08bb4e4a52..5255fd2a51 100644 --- a/src/nvim/screen.c +++ b/src/nvim/screen.c @@ -5651,13 +5651,15 @@ next_search_hl ( && cur != NULL && shl == &cur->hl && cur->match.regprog == cur->hl.rm.regprog); + int timed_out = false; - nmatched = vim_regexec_multi(&shl->rm, win, shl->buf, lnum, matchcol, &(shl->tm)); - /* Copy the regprog, in case it got freed and recompiled. */ + nmatched = vim_regexec_multi(&shl->rm, win, shl->buf, lnum, matchcol, + &(shl->tm), &timed_out); + // Copy the regprog, in case it got freed and recompiled. if (regprog_is_copy) { cur->match.regprog = cur->hl.rm.regprog; } - if (called_emsg || got_int) { + if (called_emsg || got_int || timed_out) { // Error while handling regexp: stop using this regexp. if (shl == &search_hl) { // don't free regprog in the match list, it's a copy |