updated for version 7.2b-004

diff --git a/src/eval.c b/src/eval.c
index 18c8329df9cef919b2190abcadc9ca5698cf4e1e..bb250449488984de59158533e2b5a3a44d19f52d 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -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. */
     save_cpo = p_cpo;
-    p_cpo = (char_u *)"";
+    p_cpo = empty_option;
 
 #ifdef FEAT_RELTIME
     /* Set the time limit, if there is one. */
@@ -15112,7 +15112,11 @@ do_searchpair(spat, mpat, epat, dir, skip, flags, match_pos,
 theend:
     vim_free(pat2);
     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;
 }
@@ -22503,7 +22507,7 @@ do_string_sub(str, pat, sub, flags)
 
     /* Make 'cpoptions' empty, so that the 'l' flag doesn't work here */
     save_cpo = p_cpo;
-    p_cpo = (char_u *)"";
+    p_cpo = empty_option;
 
     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);
     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;
 }

diff --git a/src/quickfix.c b/src/quickfix.c
index 6d67dd734539f29e1476a7110af94b826aa4254c..e442fcbd1a24a7aec48b2c885d81050c38684a90 100644 (file)
--- a/src/quickfix.c
+++ b/src/quickfix.c
@@ -3779,7 +3779,7 @@ ex_helpgrep(eap)
 
     /* Make 'cpoptions' empty, the 'l' flag should not be used here. */
     save_cpo = p_cpo;
-    p_cpo = (char_u *)"";
+    p_cpo = empty_option;
 
 #ifdef FEAT_MULTI_LANG
     /* Check for a specified language */
@@ -3889,7 +3889,11 @@ ex_helpgrep(eap)
        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
     qf_update_buffer(qi);

diff --git a/src/version.c b/src/version.c
index 61adb887b0949f6d77d1c6797686baf40fee4e5e..18881a73ceaa691a4dc4ca87dbcf180a292c14c4 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4,
 /**/
     3,
 /**/