summaryrefslogtreecommitdiff
path: root/src/screen.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2007-05-01 20:04:53 +0000
committerBram Moolenaar <Bram@vim.org>2007-05-01 20:04:53 +0000
commit0ddf0a7df0e3a9e966b25150df772b91f32182f8 (patch)
tree51f53549f2ff4abe0ef0d9548d1065a22073c4e6 /src/screen.c
parent8243a7928bd29db8bc0ec48fa667dd94389d6e36 (diff)
downloadvim-git-0ddf0a7df0e3a9e966b25150df772b91f32182f8.tar.gz
updated for version 7.0-238v7.0.238
Diffstat (limited to 'src/screen.c')
-rw-r--r--src/screen.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/screen.c b/src/screen.c
index b3b98bf65..eb7a63ae2 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -6477,9 +6477,15 @@ next_search_hl(win, shl, lnum, mincol)
if (called_emsg)
{
/* Error while handling regexp: stop using this regexp. */
- vim_free(shl->rm.regprog);
+ if (shl == &search_hl)
+ {
+ /* don't free the regprog in match_hl[], it's a copy */
+ vim_free(shl->rm.regprog);
+ no_hlsearch = TRUE;
+ }
shl->rm.regprog = NULL;
- no_hlsearch = TRUE;
+ shl->lnum = 0;
+ got_int = FALSE; /* avoid the "Type :quit to exit Vim" message */
break;
}
if (nmatched == 0)