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/eval.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/eval.c')
| -rw-r--r-- | src/nvim/eval.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index d18884ff07..aa0d925ff2 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -13793,7 +13793,7 @@ static int search_cmn(typval_T *argvars, pos_T *match_pos, int *flagsp) pos = save_cursor = curwin->w_cursor; subpatnum = searchit(curwin, curbuf, &pos, dir, (char_u *)pat, 1, - options, RE_SEARCH, (linenr_T)lnum_stop, &tm); + options, RE_SEARCH, (linenr_T)lnum_stop, &tm, NULL); if (subpatnum != FAIL) { if (flags & SP_SUBPAT) retval = subpatnum; @@ -14295,10 +14295,11 @@ do_searchpair( pat = pat3; for (;; ) { n = searchit(curwin, curbuf, &pos, dir, pat, 1L, - options, RE_SEARCH, lnum_stop, &tm); - if (n == FAIL || (firstpos.lnum != 0 && equalpos(pos, firstpos))) - /* didn't find it or found the first match again: FAIL */ + options, RE_SEARCH, lnum_stop, &tm, NULL); + if (n == FAIL || (firstpos.lnum != 0 && equalpos(pos, firstpos))) { + // didn't find it or found the first match again: FAIL break; + } if (firstpos.lnum == 0) firstpos = pos; |