Commit 400b2c69 authored by Karl Heuer's avatar Karl Heuer
Browse files

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

prefix_partial.  Delete Vcurrent_prefix_arg and Vprefix_arg; those are now
plain vars again.
parent ee9e37ab
...@@ -491,23 +491,12 @@ typedef struct PERDISPLAY PERDISPLAY; ...@@ -491,23 +491,12 @@ typedef struct PERDISPLAY PERDISPLAY;
struct PERDISPLAY struct PERDISPLAY
{ {
PERDISPLAY *next_perdisplay; PERDISPLAY *next_perdisplay;
Lisp_Object Vprefix_arg;
Lisp_Object Vcurrent_prefix_arg;
#ifdef MULTI_FRAME /* The state of a prefix arg. */
/* The frame in which the last input event occurred, or Qmacro if the Lisp_Object prefix_factor, prefix_value;
last event came from a macro. We use this to determine when to int prefix_sign, prefix_partial;
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;
/* Unread events specific to this display. */
Lisp_Object kbd_queue; Lisp_Object kbd_queue;
/* Placeholder for future vars that will be moved here. */ /* Placeholder for future vars that will be moved here. */
...@@ -1581,7 +1570,7 @@ extern Lisp_Object Fread_no_blanks_input (); ...@@ -1581,7 +1570,7 @@ extern Lisp_Object Fread_no_blanks_input ();
/* Defined in callint.c */ /* 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 Vcommand_history;
extern Lisp_Object Qcall_interactively; extern Lisp_Object Qcall_interactively;
extern Lisp_Object Fcall_interactively (); extern Lisp_Object Fcall_interactively ();
...@@ -1598,6 +1587,7 @@ extern Lisp_Object Vhelp_form, Vtop_level; ...@@ -1598,6 +1587,7 @@ extern Lisp_Object Vhelp_form, Vtop_level;
extern Lisp_Object Fdiscard_input (), Frecursive_edit (); extern Lisp_Object Fdiscard_input (), Frecursive_edit ();
extern Lisp_Object Fcommand_execute (), Finput_pending_p (); extern Lisp_Object Fcommand_execute (), Finput_pending_p ();
extern Lisp_Object Qvertical_scroll_bar; extern Lisp_Object Qvertical_scroll_bar;
extern void clear_prefix_arg ();
/* defined in keymap.c */ /* defined in keymap.c */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment