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/normal.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/normal.c')
| -rw-r--r-- | src/nvim/normal.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/nvim/normal.c b/src/nvim/normal.c index 49eef72a05..0b85714e39 100644 --- a/src/nvim/normal.c +++ b/src/nvim/normal.c @@ -3782,9 +3782,10 @@ find_decl ( valid = false; (void)valid; // Avoid "dead assignment" warning. t = searchit(curwin, curbuf, &curwin->w_cursor, FORWARD, - pat, 1L, searchflags, RE_LAST, (linenr_T)0, NULL); - if (curwin->w_cursor.lnum >= old_pos.lnum) - t = false; /* match after start is failure too */ + pat, 1L, searchflags, RE_LAST, (linenr_T)0, NULL, NULL); + if (curwin->w_cursor.lnum >= old_pos.lnum) { + t = false; // match after start is failure too + } if (thisblock && t != false) { const int64_t maxtravel = old_pos.lnum - curwin->w_cursor.lnum + 1; @@ -5384,7 +5385,7 @@ static int normal_search( curwin->w_set_curswant = true; i = do_search(cap->oap, dir, pat, cap->count1, - opt | SEARCH_OPT | SEARCH_ECHO | SEARCH_MSG, NULL); + opt | SEARCH_OPT | SEARCH_ECHO | SEARCH_MSG, NULL, NULL); if (i == 0) { clearop(cap->oap); } else { |