To: vim-dev@vim.org Subject: Patch 6.1b.019 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.1b.019 (depends on 6.1b.005) Problem: A search pattern that takes a long time slows down typing when 'incsearch' is set. Solution: Pass SEARCH_PEEK to dosearch(). Files: src/ex_getln.c *** ../vim61b.018/src/ex_getln.c Sat Mar 16 13:49:42 2002 --- src/ex_getln.c Sat Mar 16 13:45:04 2002 *************** *** 1394,1400 **** out_flush(); ++emsg_off; /* So it doesn't beep if bad expr */ i = do_search(NULL, firstc, ccline.cmdbuff, count, ! SEARCH_KEEP + SEARCH_OPT + SEARCH_NOOF); --emsg_off; /* if interrupted while searching, behave like it failed */ if (got_int) --- 1394,1400 ---- out_flush(); ++emsg_off; /* So it doesn't beep if bad expr */ i = do_search(NULL, firstc, ccline.cmdbuff, count, ! SEARCH_KEEP + SEARCH_OPT + SEARCH_NOOF + SEARCH_PEEK); --emsg_off; /* if interrupted while searching, behave like it failed */ if (got_int) *************** *** 1403,1408 **** --- 1403,1411 ---- got_int = FALSE; /* don't abandon the command line */ i = 0; } + else if (char_avail()) + /* cancelled searching because a char was typed */ + incsearch_postponed = TRUE; } if (i) highlight_match = TRUE; /* highlight position */ *** ../vim61b.018/src/version.c Sat Mar 16 13:49:42 2002 --- src/version.c Sat Mar 16 13:51:32 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 19, /**/ -- BLACK KNIGHT: Come on you pansy! [hah] [parry thrust] [ARTHUR chops the BLACK KNIGHT's right arm off] ARTHUR: Victory is mine! [kneeling] We thank thee Lord, that in thy merc- [Black Knight kicks Arthur in the head while he is praying] The Quest for the Holy Grail (Monty Python) /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ /// Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim \\\ \\\ Project leader for A-A-P -- http://www.a-a-p.org /// \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org ///