From 241b905b1378c5c45d8d284bb191b16807ff2a44 Mon Sep 17 00:00:00 2001 From: Billy Su Date: Thu, 7 Mar 2019 13:08:15 +0800 Subject: 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 --- src/nvim/edit.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/nvim/edit.c') diff --git a/src/nvim/edit.c b/src/nvim/edit.c index 6b31406b0c..667bc54e2e 100644 --- a/src/nvim/edit.c +++ b/src/nvim/edit.c @@ -3907,10 +3907,11 @@ static int ins_compl_get_exp(pos_T *ini) compl_direction, compl_pattern); } else found_new_match = searchit(NULL, ins_buf, pos, - compl_direction, - compl_pattern, 1L, SEARCH_KEEP + SEARCH_NFMSG, - RE_LAST, (linenr_T)0, NULL); - --msg_silent; + compl_direction, + compl_pattern, 1L, + SEARCH_KEEP + SEARCH_NFMSG, + RE_LAST, (linenr_T)0, NULL, NULL); + msg_silent--; if (!compl_started || set_match_pos) { /* set "compl_started" even on fail */ compl_started = TRUE; -- cgit