updated for version 7.1-147

diff --git a/src/ex_getln.c b/src/ex_getln.c
index 7ce48a891a08f071b475561cc6672d54d535b3f5..68966def057630ce5a1ab2f0e3a31e6f1d3679e2 100644 (file)
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -3353,6 +3353,7 @@ ExpandOne(xp, str, orig, options, mode)
     char_u     *ss = NULL;
     static int findex;
     static char_u *orig_save = NULL;   /* kept value of orig */
+    int                orig_saved = FALSE;
     int                i;
     long_u     len;
     int                non_suf_match;          /* number without matching suffix */
@@ -3421,6 +3422,7 @@ ExpandOne(xp, str, orig, options, mode)
     {
        vim_free(orig_save);
        orig_save = orig;
+       orig_saved = TRUE;
 
        /*
         * Do the expansion.
@@ -3546,7 +3548,7 @@ ExpandOne(xp, str, orig, options, mode)
        ExpandCleanup(xp);
 
     /* Free "orig" if it wasn't stored in "orig_save". */
-    if (orig != orig_save)
+    if (!orig_saved)
        vim_free(orig);
 
     return ss;

diff --git a/src/version.c b/src/version.c
index 9806fb251c9bfdd950a6055a77821c82852f4419..4a24da3c9984adb470aead79b51568b6486feca1 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    147,
 /**/
     146,
 /**/