patch 9.0.0312: test for cmdheight zero fails

Problem:    Test for cmdheight zero fails.
Solution:   Do not close the messages window for CTRL-C.

diff --git a/src/normal.c b/src/normal.c
index 12b611e1742d6fb779d4d804fdd4a804c33cceb7..926f50478ebfe84d7d8a51ddf173e485c7471462 100644 (file)
--- a/src/normal.c
+++ b/src/normal.c
@@ -6822,7 +6822,7 @@ nv_esc(cmdarg_T *cap)
     else if (no_reason)
     {
 #ifdef HAS_MESSAGE_WINDOW
-       if (popup_message_win_visible())
+       if (!cap->arg && popup_message_win_visible())
            popup_hide_message_win();
        else
 #endif

diff --git a/src/version.c b/src/version.c
index e6ecb979635ed08252aed1a83ab321aafb11373f..61793a927025f0f66d6ecafd1bca509664152f85 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 */
+/**/
+    312,
 /**/
     311,
 /**/