diff options
| -rw-r--r-- | src/cmdexpand.c | 13 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 11 deletions
diff --git a/src/cmdexpand.c b/src/cmdexpand.c index a10fff8b3..fe82ab7d4 100644 --- a/src/cmdexpand.c +++ b/src/cmdexpand.c @@ -494,18 +494,9 @@ ExpandOne( void ExpandInit(expand_T *xp) { - xp->xp_pattern = NULL; - xp->xp_pattern_len = 0; + CLEAR_POINTER(xp); xp->xp_backslash = XP_BS_NONE; -#ifndef BACKSLASH_IN_FILENAME - xp->xp_shell = FALSE; -#endif xp->xp_numfiles = -1; - xp->xp_files = NULL; -#if defined(FEAT_EVAL) - xp->xp_arg = NULL; -#endif - xp->xp_line = NULL; } /* @@ -2425,7 +2416,7 @@ expand_shellcmd( # if defined(FEAT_EVAL) /* * Call "user_expand_func()" to invoke a user defined Vim script function and - * return the result (either a string or a List). + * return the result (either a string, a List or NULL). */ static void * call_user_expand_func( diff --git a/src/version.c b/src/version.c index 14044481a..0bd3cb20a 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1289, +/**/ 1288, /**/ 1287, |