(Fwhile): If mocklisp, test for nonzeroness.

[gnu-emacs] / src / commands.h

diff --git a/src/commands.h b/src/commands.h
index fb9c7e56b2515e73b922e0222a363660c4146275..0f733aeb42cba8014f2fa6075040db10e825b651 100644 (file)
--- a/src/commands.h
+++ b/src/commands.h
@@ -20,18 +20,14 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define Ctl(c) ((c)&037)
 
-/* Define the names of keymaps, just so people can refer to
-   them in calls to initial_define_key */
-
+/* Define the names of keymaps, just so people can refer to them in
+   calls to initial_define_key.  These should *not* be used after
+   initialization; use-global-map doesn't affect these; it sets
+   current_global_map instead.  */
 extern Lisp_Object global_map;
-
 extern Lisp_Object meta_map;
-
 extern Lisp_Object control_x_map;
 
-/* Keymap for mouse commands.  */
-extern Lisp_Object Vglobal_mouse_map;
-
 extern Lisp_Object Vminibuffer_local_map;
 
 extern Lisp_Object Vminibuffer_local_ns_map;
@@ -49,8 +45,17 @@ extern Lisp_Object last_command_char;
    reached by the mouse.  */
 extern Lisp_Object last_nonmenu_event;
 
-/* Command character to be re-read, or -1 */
-extern int unread_command_char;
+/* List of command events to be re-read, or Qnil.  */
+extern Lisp_Object unread_command_events;
+
+/* If not Qnil, this is a switch-frame event which we decided to put
+   off until the end of a key sequence.  This should be read as the
+   next command input, after any unread_command_events.
+
+   read_key_sequence uses this to delay switch-frame events until the
+   end of the key sequence; Fread_char uses it to put off switch-frame
+   events until a non-ASCII event is acceptable as input.  */
+extern Lisp_Object unread_switch_frame;
 
 /* Previous command symbol found here for comparison */
 extern Lisp_Object last_command;