diff options
| -rw-r--r-- | src/eval.c | 6 | ||||
| -rw-r--r-- | src/ex_cmds.c | 2 | ||||
| -rw-r--r-- | src/os_win32.c | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 6 insertions, 7 deletions
diff --git a/src/eval.c b/src/eval.c index af4ba893f..d7e8332b0 100644 --- a/src/eval.c +++ b/src/eval.c @@ -5106,9 +5106,7 @@ eval7(arg, rettv, evaluate, want_string) else ret = OK; } - - if (alias != NULL) - vim_free(alias); + vim_free(alias); } *arg = skipwhite(*arg); @@ -19807,7 +19805,7 @@ set_var(name, tv, copy) EMSG2(_("E704: Funcref variable name must start with a capital: %s"), name); return; } - /* Don't allow hiding a function. When "v" is not NULL we migth be + /* Don't allow hiding a function. When "v" is not NULL we might be * assigning another function to the same var, the type is checked * below. */ if (v == NULL && function_exists(name)) diff --git a/src/ex_cmds.c b/src/ex_cmds.c index 3678083b3..3b2557efc 100644 --- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -5412,7 +5412,7 @@ read_viminfo_sub_string(virp, force) vir_T *virp; int force; { - if (old_sub != NULL && force) + if (force) vim_free(old_sub); if (force || old_sub == NULL) old_sub = viminfo_readstring(virp, 1, TRUE); diff --git a/src/os_win32.c b/src/os_win32.c index 30b725d4c..90664e626 100644 --- a/src/os_win32.c +++ b/src/os_win32.c @@ -1886,8 +1886,7 @@ SaveConsoleBuffer( cb->BufferSize.X = cb->Info.dwSize.X; cb->BufferSize.Y = cb->Info.dwSize.Y; NumCells = cb->BufferSize.X * cb->BufferSize.Y; - if (cb->Buffer != NULL) - vim_free(cb->Buffer); + vim_free(cb->Buffer); cb->Buffer = (PCHAR_INFO)alloc(NumCells * sizeof(CHAR_INFO)); if (cb->Buffer == NULL) return FALSE; diff --git a/src/version.c b/src/version.c index 12aa05b8f..0ac6feb0f 100644 --- a/src/version.c +++ b/src/version.c @@ -715,6 +715,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 108, +/**/ 107, /**/ 106, |