Mirror of the Vim source from https://github.com/vim/vim
Revisão | 56695f1182f01d75843d0433484c94c1eade71de (tree) |
---|---|
Hora | 2007-05-02 05:04:53 |
Autor | vimboss |
Commiter | vimboss |
updated for version 7.0-238
@@ -6477,9 +6477,15 @@ | ||
6477 | 6477 | if (called_emsg) |
6478 | 6478 | { |
6479 | 6479 | /* Error while handling regexp: stop using this regexp. */ |
6480 | - vim_free(shl->rm.regprog); | |
6480 | + if (shl == &search_hl) | |
6481 | + { | |
6482 | + /* don't free the regprog in match_hl[], it's a copy */ | |
6483 | + vim_free(shl->rm.regprog); | |
6484 | + no_hlsearch = TRUE; | |
6485 | + } | |
6481 | 6486 | shl->rm.regprog = NULL; |
6482 | - no_hlsearch = TRUE; | |
6487 | + shl->lnum = 0; | |
6488 | + got_int = FALSE; /* avoid the "Type :quit to exit Vim" message */ | |
6483 | 6489 | break; |
6484 | 6490 | } |
6485 | 6491 | if (nmatched == 0) |
@@ -667,6 +667,8 @@ | ||
667 | 667 | static int included_patches[] = |
668 | 668 | { /* Add new patch number below this line */ |
669 | 669 | /**/ |
670 | + 238, | |
671 | +/**/ | |
670 | 672 | 237, |
671 | 673 | /**/ |
672 | 674 | 236, |