updated for version 7.4.499

Problem:    substitute() can be slow with long strings.
Solution:   Store a pointer to the end, instead of calling strlen() every
            time. (Ozaki Kiichi)

diff --git a/src/eval.c b/src/eval.c
index f5aa7e919e32e9c56116cbfb36dc695ec0d5f0ea..ecc5e3a572770fffa1794c7ef775498601d34509 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -25076,6 +25076,7 @@ do_string_sub(str, pat, sub, flags)
     int                i;
     int                do_all;
     char_u     *tail;
+    char_u     *end;
     garray_T   ga;
     char_u     *ret;
     char_u     *save_cpo;
@@ -25094,6 +25095,7 @@ do_string_sub(str, pat, sub, flags)
     if (regmatch.regprog != NULL)
     {
        tail = str;
+       end = str + STRLEN(str);
        while (vim_regexec_nl(&regmatch, str, (colnr_T)(tail - str)))
        {
            /* Skip empty match except for first match. */
@@ -25120,7 +25122,7 @@ do_string_sub(str, pat, sub, flags)
             * - The text after the match.
             */
            sublen = vim_regsub(&regmatch, sub, tail, FALSE, TRUE, FALSE);
-           if (ga_grow(&ga, (int)(STRLEN(tail) + sublen -
+           if (ga_grow(&ga, (int)((end - tail) + sublen -
                            (regmatch.endp[0] - regmatch.startp[0]))) == FAIL)
            {
                ga_clear(&ga);

diff --git a/src/version.c b/src/version.c
index ae1a56b5b5d7a0f71f90414d4511ce9ec7253597..9008518e2347150b8fd78b05e4dfe3fa8e15a65f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    499,
 /**/
     498,
 /**/