comparison src/ex_docmd.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 6fff8b86e9bd
children 3d03ed329a54
comparison
equal deleted inserted replaced
11520:8b54fc8a4b2e 11521:578df034735d
4554 curwin->w_cursor.col = MAXCOL; 4554 curwin->w_cursor.col = MAXCOL;
4555 else 4555 else
4556 curwin->w_cursor.col = 0; 4556 curwin->w_cursor.col = 0;
4557 searchcmdlen = 0; 4557 searchcmdlen = 0;
4558 if (!do_search(NULL, c, cmd, 1L, 4558 if (!do_search(NULL, c, cmd, 1L,
4559 SEARCH_HIS | SEARCH_MSG, NULL)) 4559 SEARCH_HIS | SEARCH_MSG, NULL, NULL))
4560 { 4560 {
4561 curwin->w_cursor = pos; 4561 curwin->w_cursor = pos;
4562 cmd = NULL; 4562 cmd = NULL;
4563 goto error; 4563 goto error;
4564 } 4564 }
4611 pos.coladd = 0; 4611 pos.coladd = 0;
4612 #endif 4612 #endif
4613 if (searchit(curwin, curbuf, &pos, 4613 if (searchit(curwin, curbuf, &pos,
4614 *cmd == '?' ? BACKWARD : FORWARD, 4614 *cmd == '?' ? BACKWARD : FORWARD,
4615 (char_u *)"", 1L, SEARCH_MSG, 4615 (char_u *)"", 1L, SEARCH_MSG,
4616 i, (linenr_T)0, NULL) != FAIL) 4616 i, (linenr_T)0, NULL, NULL) != FAIL)
4617 lnum = pos.lnum; 4617 lnum = pos.lnum;
4618 else 4618 else
4619 { 4619 {
4620 cmd = NULL; 4620 cmd = NULL;
4621 goto error; 4621 goto error;