patch 9.0.0815
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 93f9dd7..676ab70 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -929,6 +929,8 @@
STRCAT(t, newcmd);
if (ins_prevcmd)
STRCAT(t, prevcmd);
+ else
+ vim_free(t);
p = t + STRLEN(t);
STRCAT(t, trailarg);
vim_free(newcmd);
@@ -957,17 +959,13 @@
}
} while (trailarg != NULL);
- // Don't do anything if there is no command as there isn't really anything
- // useful in running "sh -c ''". Avoids changing "prevcmd".
- if (STRLEN(newcmd) == 0)
+ // Don't clear "prevcmd" if there is no command to run.
+ if (STRLEN(newcmd) > 0)
{
- vim_free(newcmd);
- return;
+ vim_free(prevcmd);
+ prevcmd = newcmd;
}
- vim_free(prevcmd);
- prevcmd = newcmd;
-
if (bangredo) // put cmd in redo buffer for ! command
{
// If % or # appears in the command, it must have been escaped.
diff --git a/src/testdir/test_shell.vim b/src/testdir/test_shell.vim
index 1b4b1f9..3ac4681 100644
--- a/src/testdir/test_shell.vim
+++ b/src/testdir/test_shell.vim
@@ -268,8 +268,8 @@
call assert_equal(['Cmd: [-c echo coconut]'], readfile('Xlog'))
call writefile(['empty'], 'Xlog')
- call feedkeys(":!\<CR>", 'xt') " :! is a no-op
- call assert_equal(['empty'], readfile('Xlog'))
+ call feedkeys(":!\<CR>", 'xt') " :!
+ call assert_equal(['Cmd: [-c ]'], readfile('Xlog'))
call feedkeys(":!!\<CR>", 'xt') " :! doesn't clear previous command
call assert_equal(['Cmd: [-c echo coconut]'], readfile('Xlog'))
diff --git a/src/version.c b/src/version.c
index 690a197..237cd7c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 815,
+/**/
814,
/**/
813,