Merge from emacs--devo--0

[gnu-emacs] / src / keyboard.h

diff --git a/src/keyboard.h b/src/keyboard.h
index ae135b30b77b8a225963dba9f4202aceb362a6dd..6d046bc98e7ec836abb50cd4852b4e6a99922528 100644 (file)
--- a/src/keyboard.h
+++ b/src/keyboard.h
@@ -80,8 +80,7 @@ struct kboard
        commands that set the prefix argument.  */
     Lisp_Object Vlast_command;
 
-    /* Normally same as last-command, but never modified by
-       other commands.  */
+    /* Normally same as last-command, but never modified by other commands.  */
     Lisp_Object Vreal_last_command;
 
     /* User-supplied table to translate input characters through.  */
@@ -130,6 +129,9 @@ struct kboard
     /* Cache for modify_event_symbol.  */
     Lisp_Object system_key_syms;
 
+    /* The kind of display: x, w32, ...  */
+    Lisp_Object Vwindow_system;
+
     /* Keymap mapping keys to alternative preferred forms.
        See the DEFVAR for more documentation.  */
     Lisp_Object Vlocal_function_key_map;