diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-06-17 18:44:21 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-06-17 18:44:21 +0200 |
| commit | fbd0b0af6800f6ff89857863d6a07ea03f09ff6c (patch) | |
| tree | d970232ff584511e30efcfe2f7ea5eefb9e9f8d4 /src/ex_docmd.c | |
| parent | 8cf91286ca46a501d24e4b7d631b193256782c88 (diff) | |
patch 8.0.0643: when a pattern search is slow Vim becomes unusablev8.0.0643
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.
Diffstat (limited to 'src/ex_docmd.c')
| -rw-r--r-- | src/ex_docmd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c index bf340de405..9dac9bf3a7 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -4556,7 +4556,7 @@ get_address( curwin->w_cursor.col = 0; searchcmdlen = 0; if (!do_search(NULL, c, cmd, 1L, - SEARCH_HIS | SEARCH_MSG, NULL)) + SEARCH_HIS | SEARCH_MSG, NULL, NULL)) { curwin->w_cursor = pos; cmd = NULL; @@ -4613,7 +4613,7 @@ get_address( if (searchit(curwin, curbuf, &pos, *cmd == '?' ? BACKWARD : FORWARD, (char_u *)"", 1L, SEARCH_MSG, - i, (linenr_T)0, NULL) != FAIL) + i, (linenr_T)0, NULL, NULL) != FAIL) lnum = pos.lnum; else { |