1 files changed, 3 insertions, 4 deletions
diff --git a/src/nvim/message.c b/src/nvim/message.c
index ec5dabbbc0..7ac846a553 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -1284,7 +1284,7 @@ void set_keep_msg(char_u *s, int attr)
     keep_msg = vim_strsave(s);
   else
     keep_msg = NULL;
-  keep_msg_more = FALSE;
+  keep_msg_more = false;
   keep_msg_attr = attr;
 }
 
@@ -1324,9 +1324,8 @@ void msg_start(void)
       0;
   } else if (msg_didout) {                // start message on next line
     msg_putchar('\n');
-    did_return = TRUE;
-    if (exmode_active != EXMODE_NORMAL)
-      cmdline_row = msg_row;
+    did_return = true;
+    cmdline_row = msg_row;
   }
   if (!msg_didany || lines_left < 0)
     msg_starthere();