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/ex_getln.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/ex_getln.c')
| -rw-r--r-- | src/nvim/ex_getln.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c index a50e18efce..8e6fc5ad4f 100644 --- a/src/nvim/ex_getln.c +++ b/src/nvim/ex_getln.c @@ -1061,7 +1061,7 @@ static void command_line_next_incsearch(CommandLineState *s, bool next_match) s->i = searchit(curwin, curbuf, &t, next_match ? FORWARD : BACKWARD, pat, s->count, search_flags, - RE_SEARCH, 0, NULL); + RE_SEARCH, 0, NULL, NULL); emsg_off--; ui_busy_stop(); if (s->i) { @@ -1847,7 +1847,7 @@ static int command_line_changed(CommandLineState *s) } s->i = do_search(NULL, s->firstc, ccline.cmdbuff, s->count, search_flags, - &tm); + &tm, NULL); emsg_off--; // if interrupted while searching, behave like it failed if (got_int) { |