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/normal.c | |
| parent | 8cf91286ca46a501d24e4b7d631b193256782c88 (diff) | |
| download | vim-git-fbd0b0af6800f6ff89857863d6a07ea03f09ff6c.tar.gz | |
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/normal.c')
| -rw-r--r-- | src/normal.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/normal.c b/src/normal.c index 7b3f94af5..74a5efec9 100644 --- a/src/normal.c +++ b/src/normal.c @@ -4358,7 +4358,7 @@ find_decl( { valid = FALSE; t = searchit(curwin, curbuf, &curwin->w_cursor, FORWARD, - pat, 1L, searchflags, RE_LAST, (linenr_T)0, NULL); + pat, 1L, searchflags, RE_LAST, (linenr_T)0, NULL, NULL); if (curwin->w_cursor.lnum >= old_pos.lnum) t = FAIL; /* match after start is failure too */ @@ -6380,7 +6380,7 @@ 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 |