(struct PERDISPLAY): Add prefix_factor, prefix_value, prefix_sign,

prefix_partial.  Delete Vcurrent_prefix_arg and Vprefix_arg; those are now
plain vars again.

1 files changed, 6 insertions, 16 deletions

diff --git a/src/lisp.h b/src/lisp.h
index a006dd33476..2bbf7a54f26 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -491,23 +491,12 @@ typedef struct PERDISPLAY PERDISPLAY;
 struct PERDISPLAY
   {
     PERDISPLAY *next_perdisplay;
-    Lisp_Object Vprefix_arg;
-    Lisp_Object Vcurrent_prefix_arg;
 
-#ifdef MULTI_FRAME
-    /* The frame in which the last input event occurred, or Qmacro if the
-       last event came from a macro.  We use this to determine when to
-       generate switch-frame events.  This may be cleared by functions
-       like Fselect_frame, to make sure that a switch-frame event is
-       generated by the next character.  */
-    Lisp_Object internal_last_event_frame;
-#endif
-
-    /* A user-visible version of the above, intended to allow users to
-       figure out where the last event came from, if the event doesn't
-       carry that information itself (i.e. if it was a character).  */
-    Lisp_Object Vlast_event_frame;
+    /* The state of a prefix arg.  */
+    Lisp_Object prefix_factor, prefix_value;
+    int prefix_sign, prefix_partial;
 
+    /* Unread events specific to this display.  */
     Lisp_Object kbd_queue;
 
     /* Placeholder for future vars that will be moved here.  */
@@ -1581,7 +1570,7 @@ extern Lisp_Object Fread_no_blanks_input ();
 
 /* Defined in callint.c */
 
-extern Lisp_Object Qminus, Qplus;
+extern Lisp_Object Qminus, Qplus, Vcurrent_prefix_arg, Vprefix_arg;
 extern Lisp_Object Vcommand_history;
 extern Lisp_Object Qcall_interactively;
 extern Lisp_Object Fcall_interactively ();
@@ -1598,6 +1587,7 @@ extern Lisp_Object Vhelp_form, Vtop_level;
 extern Lisp_Object Fdiscard_input (), Frecursive_edit ();
 extern Lisp_Object Fcommand_execute (), Finput_pending_p ();
 extern Lisp_Object Qvertical_scroll_bar;
+extern void clear_prefix_arg ();
 
 /* defined in keymap.c */