diff --git a/src/misc1.c b/src/misc1.c
index 99c90f7..55c9bd5 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -222,10 +222,11 @@
 	    *s++ = *p++;
 	    orig_char_len--;
 	}
+
 	/* Skip over any additional white space (useful when newindent is less
 	 * than old) */
 	while (vim_iswhite(*p))
-	    (void)*p++;
+	    ++p;
 
     }
     else
@@ -3024,7 +3025,7 @@
 	if (direct)
 	    r = get_keystroke();
 	else
-	    r = safe_vgetc();
+	    r = plain_vgetc();
 	if (r == Ctrl_C || r == ESC)
 	    r = 'n';
 	msg_putchar(r);	    /* show what you typed */