Mercurial > vim
comparison src/gui.c @ 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 | 26525db57c4c |
| children | 504df4aa84c6 |
comparison
equal
deleted
inserted
replaced
| 11520:8b54fc8a4b2e | 11521:578df034735d |
|---|---|
| 5359 * Don't skip text under cursor for single replace. */ | 5359 * Don't skip text under cursor for single replace. */ |
| 5360 if (type == FRD_REPLACE) | 5360 if (type == FRD_REPLACE) |
| 5361 searchflags += SEARCH_START; | 5361 searchflags += SEARCH_START; |
| 5362 i = msg_scroll; | 5362 i = msg_scroll; |
| 5363 (void)do_search(NULL, down ? '/' : '?', ga.ga_data, 1L, | 5363 (void)do_search(NULL, down ? '/' : '?', ga.ga_data, 1L, |
| 5364 searchflags, NULL); | 5364 searchflags, NULL, NULL); |
| 5365 msg_scroll = i; /* don't let an error message set msg_scroll */ | 5365 msg_scroll = i; /* don't let an error message set msg_scroll */ |
| 5366 } | 5366 } |
| 5367 | 5367 |
| 5368 /* Don't want to pass did_emsg to other code, it may cause disabling | 5368 /* Don't want to pass did_emsg to other code, it may cause disabling |
| 5369 * syntax HL if we were busy redrawing. */ | 5369 * syntax HL if we were busy redrawing. */ |