# HG changeset patch
# User vimboss
# Date 1193762235 0
# Node ID bca50c9e1374c176a63f9baf0ed7fcb34ea16967
# Parent  d065616e083680035f38a54409e857ebc2202db3
updated for version 7.1-147

diff --git a/src/ex_getln.c b/src/ex_getln.c
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    147,
+/**/
     146,
 /**/
     145,