thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.2b-004

Browse Source
This commit is contained in:
Bram Moolenaar
2008-07-14 21:05:15 +00:00
parent af51e66c5a
commit 9c24ccc7b8
3 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/eval.c
View File

@@ -14997,7 +14997,7 @@ do_searchpair(spat, mpat, epat, dir, skip, flags, match_pos,
/* Make 'cpoptions' empty, the 'l' flag should not be used here. */ /* Make 'cpoptions' empty, the 'l' flag should not be used here. */
save_cpo = p_cpo; save_cpo = p_cpo;
p_cpo = (char_u *)""; p_cpo = empty_option;
#ifdef FEAT_RELTIME #ifdef FEAT_RELTIME
/* Set the time limit, if there is one. */ /* Set the time limit, if there is one. */
@@ -15112,7 +15112,11 @@ do_searchpair(spat, mpat, epat, dir, skip, flags, match_pos,
theend: theend:
vim_free(pat2); vim_free(pat2);
vim_free(pat3); vim_free(pat3);
p_cpo = save_cpo; if (p_cpo == empty_option)
p_cpo = save_cpo;
else
/* Darn, evaluating the {skip} expression changed the value. */
free_string_option(save_cpo);
return retval; return retval;
} }
@@ -22503,7 +22507,7 @@ do_string_sub(str, pat, sub, flags)
/* Make 'cpoptions' empty, so that the 'l' flag doesn't work here */ /* Make 'cpoptions' empty, so that the 'l' flag doesn't work here */
save_cpo = p_cpo; save_cpo = p_cpo;
p_cpo = (char_u *)""; p_cpo = empty_option;
ga_init2(&ga, 1, 200); ga_init2(&ga, 1, 200);
@@ -22564,7 +22568,11 @@ do_string_sub(str, pat, sub, flags)
ret = vim_strsave(ga.ga_data == NULL ? str : (char_u *)ga.ga_data); ret = vim_strsave(ga.ga_data == NULL ? str : (char_u *)ga.ga_data);
ga_clear(&ga); ga_clear(&ga);
p_cpo = save_cpo; if (p_cpo == empty_option)
p_cpo = save_cpo;
else
/* Darn, evaluating {sub} expression changed the value. */
free_string_option(save_cpo);
return ret; return ret;
} }

8
src/quickfix.c
View File

@@ -3779,7 +3779,7 @@ ex_helpgrep(eap)
/* Make 'cpoptions' empty, the 'l' flag should not be used here. */ /* Make 'cpoptions' empty, the 'l' flag should not be used here. */
save_cpo = p_cpo; save_cpo = p_cpo;
p_cpo = (char_u *)""; p_cpo = empty_option;
#ifdef FEAT_MULTI_LANG #ifdef FEAT_MULTI_LANG
/* Check for a specified language */ /* Check for a specified language */
@@ -3889,7 +3889,11 @@ ex_helpgrep(eap)
qi->qf_lists[qi->qf_curlist].qf_index = 1; qi->qf_lists[qi->qf_curlist].qf_index = 1;
} }
p_cpo = save_cpo; if (p_cpo == empty_option)
p_cpo = save_cpo;
else
/* Darn, some plugin changed the value. */
free_string_option(save_cpo);
#ifdef FEAT_WINDOWS #ifdef FEAT_WINDOWS
qf_update_buffer(qi); qf_update_buffer(qi);

2
src/version.c
View File

@@ -676,6 +676,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
4,
/**/ /**/
3, 3,
/**/ /**/