diff options
| -rw-r--r-- | src/ex_getln.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c index 7ce48a891..68966def0 100644 --- 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 9806fb251..4a24da3c9 100644 --- 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, |