Mercurial > vim
comparison src/regexp.h @ 11521:578df034735d v8.0.0643
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
commit https://github.com/vim/vim/commit/fbd0b0af6800f6ff89857863d6a07ea03f09ff6c
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jun 17 18:44:21 2017 +0200
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.
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sat, 17 Jun 2017 18:45:04 +0200 |
parents | 4aead6a9b7a9 |
children | ffd834f893aa |
comparison
equal
deleted
inserted
replaced
11520:8b54fc8a4b2e | 11521:578df034735d |
---|---|
163 | 163 |
164 struct regengine | 164 struct regengine |
165 { | 165 { |
166 regprog_T *(*regcomp)(char_u*, int); | 166 regprog_T *(*regcomp)(char_u*, int); |
167 void (*regfree)(regprog_T *); | 167 void (*regfree)(regprog_T *); |
168 int (*regexec_nl)(regmatch_T*, char_u*, colnr_T, int); | 168 int (*regexec_nl)(regmatch_T *, char_u *, colnr_T, int); |
169 long (*regexec_multi)(regmmatch_T*, win_T*, buf_T*, linenr_T, colnr_T, proftime_T*); | 169 long (*regexec_multi)(regmmatch_T *, win_T *, buf_T *, linenr_T, colnr_T, proftime_T *, int *); |
170 char_u *expr; | 170 char_u *expr; |
171 }; | 171 }; |
172 | 172 |
173 #endif /* _REGEXP_H */ | 173 #endif /* _REGEXP_H */ |