diff --git a/src/getchar.c b/src/getchar.c
index aea8d10..c6d9492 100644
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -2819,7 +2819,8 @@
 			edit_unputchar();
 		    if (State & CMDLINE)
 			unputcmdline();
-		    setcursor();	/* put cursor back where it belongs */
+		    else
+			setcursor();	/* put cursor back where it belongs */
 		}
 
 		if (c < 0)
diff --git a/src/version.c b/src/version.c
index 9eecd6f..a6b23f1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    540,
+/**/
     539,
 /**/
     538,