diff --git a/src/eval.c b/src/eval.c
index 8e41649400..273ac41360 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -9792,6 +9792,9 @@ f_getchar(argvars, rettv)
     varnumber_T		n;
     int			error = FALSE;
 
+    /* Position the cursor.  Needed after a message that ends in a space. */
+    windgoto(msg_row, msg_col);
+
     ++no_mapping;
     ++allow_keys;
     if (argvars[0].v_type == VAR_UNKNOWN)
diff --git a/src/version.c b/src/version.c
index 0b0703c565..bdbd51d075 100644
--- 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 */
+/**/
+    29,
 /**/
     28,
 /**/