summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/normal.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/normal.c b/src/normal.c
index 12b611e174..926f50478e 100644
--- 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 e6ecb97963..61793a9270 100644
--- a/src/version.c
+++ b/src/version.c
@@ -708,6 +708,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 312,
+/**/
311,
/**/
310,