Mercurial > vim

changeset 2359:496feb41b83f vim73

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix: When 'searchhl' causes a hang make CTRL-C disable 'shearchhl'.
author Bram Moolenaar <bram@vim.org>
date Tue, 20 Jul 2010 13:11:28 +0200
parents 72a3c2766396
children d8e4b27cef80
files runtime/doc/todo.txt src/screen.c
diffstat 2 files changed, 3 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -30,16 +30,12 @@ be worked on, but only if you sponsor Vi
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-Update syntax menus: run checkmenu.
-
-GTK: torn-off menu doesn't work.
-
-:find completion has duplicates. (Bjorn Winckler, 2010 Jul 18)
+GTK: torn-off menu doesn't work.  Because of patch for file selector?
 
 Win64: diff.exe crashes on Win64. (Julianne Bailey, 2006 Dec 12)
 Build another diff.exe somehow?
 
-Hang in search HL, CTRL-C should clear it. (Dimitar Dimitrov, 2010 Jul 19)
+:find completion has duplicates. (Bjorn Winckler, 2010 Jul 18)
 
 Conceal: don't show for 'hlmatch' when 'modifiable' is off?
 And don't care about 'cursorline'.
--- a/src/screen.c
+++ b/src/screen.c
@@ -7119,7 +7119,7 @@ next_search_hl(win, shl, lnum, mincol)
 		NULL
 #endif
 		);
-	if (called_emsg)
+	if (called_emsg || got_int)
 	{
 	    /* Error while handling regexp: stop using this regexp. */
 	    if (shl == &search_hl)