updated for version 7.1-160

diff --git a/src/message.c b/src/message.c
index 6aa6746fc4bda3ab31a01b1f68bd69ee04f53f81..b2daa90e22ef902a246b9d22874ef33bc97c0ccb 100644 (file)
--- a/src/message.c
+++ b/src/message.c
@@ -2850,6 +2850,15 @@ repeat_message()
     }
     else if (State == HITRETURN || State == SETWSIZE)
     {
+       if (msg_row == Rows - 1)
+       {
+           /* Avoid drawing the "hit-enter" prompt below the previous one,
+            * overwrite it.  Esp. useful when regaining focus and a
+            * FocusGained autocmd exists but didn't draw anything. */
+           msg_didout = FALSE;
+           msg_col = 0;
+           msg_clr_eos();
+       }
        hit_return_msg();
        msg_row = Rows - 1;
     }

diff --git a/src/version.c b/src/version.c
index e044725a38e92d98d64b735ecdaeef8e6468635a..c4595c79d2eac4ab28e2d2f42bad22a8a2851487 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    160,
 /**/
     159,
 /**/