diff --git a/lisp/textmodes/page.el b/lisp/textmodes/page.el
index cb9b3aa78f3..9d57cb18ecf 100644
--- a/lisp/textmodes/page.el
+++ b/lisp/textmodes/page.el
@@ -29,6 +29,9 @@ A page boundary is any line whose beginning matches the regexp
   (interactive "p")
   (or count (setq count 1))
   (while (and (> count 0) (not (eobp)))
+    ;; In case the page-delimiter matches the null string,
+    ;; don't find a match without moving.
+    (if (bolp) (forward-char 1))
     (if (re-search-forward page-delimiter nil t)
 	nil
       (goto-char (point-max)))
diff --git a/src/commands.h b/src/commands.h
index 26141818fe9..fb9c7e56b25 100644
--- a/src/commands.h
+++ b/src/commands.h
@@ -45,6 +45,10 @@ extern Lisp_Object Vminibuffer_local_must_match_map;
 /* Last character of last key sequence.  */
 extern Lisp_Object last_command_char;
 
+/* Last input character read as a command, not counting menus
+   reached by the mouse.  */
+extern Lisp_Object last_nonmenu_event;
+
 /* Command character to be re-read, or -1 */
 extern int unread_command_char;