patch 9.0.0315: shell command is displayed in message window

Problem:    Shell command is displayed in message window.
Solution:   Do not echo the shell command in the message window.

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 01518ff64deca6d25f6029ea4db00b84d6d758e9..96302529ccc70a10eae16112bfecaabb09a5917a 100644 (file)
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -1011,6 +1011,7 @@ do_bang(
     if (addr_count == 0)               // :!
     {
        // echo the command
+       dont_use_message_window();
        msg_start();
        msg_putchar(':');
        msg_putchar('!');

diff --git a/src/message.c b/src/message.c
index e4f8af11afa168be6610bb43a6c8a88acc06638e..5c5e3783aea8b8f54837f9147a88ffaadadd4861 100644 (file)
--- a/src/message.c
+++ b/src/message.c
@@ -1472,7 +1472,7 @@ msg_start(void)
     }
 
 #ifdef FEAT_EVAL
-    if (need_clr_eos || p_ch == 0)
+    if (need_clr_eos || use_message_window())
     {
        // Halfway an ":echo" command and getting an (error) message: clear
        // any text from the command.
@@ -1508,8 +1508,9 @@ msg_start(void)
 #endif
            0;
     }
-    else if (msg_didout || p_ch == 0)      // start message on next line
+    else if (msg_didout || use_message_window())
     {
+       // start message on next line
        msg_putchar('\n');
        did_return = TRUE;
        if (exmode_active != EXMODE_NORMAL)

diff --git a/src/version.c b/src/version.c
index b1eb73f861282e3bacc50a3e00cb5a326025007d..82b43beee1768f61e3293b2476868e5969397666 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -707,6 +707,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    315,
 /**/
     314,
 /**/