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/regexp_defs.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/nvim/regexp_defs.h') diff --git a/src/nvim/regexp_defs.h b/src/nvim/regexp_defs.h index b5d56e07fc..298d82fc6b 100644 --- a/src/nvim/regexp_defs.h +++ b/src/nvim/regexp_defs.h @@ -156,11 +156,11 @@ struct reg_extmatch { }; struct regengine { - regprog_T *(*regcomp)(char_u*, int); + regprog_T *(*regcomp)(char_u *, int); void (*regfree)(regprog_T *); - int (*regexec_nl)(regmatch_T*, char_u*, colnr_T, bool); - long (*regexec_multi)(regmmatch_T*, win_T*, buf_T*, linenr_T, colnr_T, - proftime_T*); + int (*regexec_nl)(regmatch_T *, char_u *, colnr_T, bool); + long (*regexec_multi)(regmmatch_T *, win_T *, buf_T *, linenr_T, colnr_T, + proftime_T *, int *); char_u *expr; }; -- cgit