From: Paul Eggert Date: Fri, 17 Aug 2012 23:38:43 +0000 (-0700) Subject: * keyboard.h (KSET): Remove. X-Git-Tag: emacs-24.2.90~621 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=15dbb4d6ba5dea7d3e0f45ab3fd038c2b305a145;p=emacs.git * keyboard.h (KSET): Remove. Replace all uses with calls to new setter functions. Use INLINE_HEADER_BEGIN, INLINE_HEADER_END. (KEYBOARD_INLINE): New macro. (kset_default_minibuffer_frame, kset_defining_kbd_macro) (kset_input_decode_map, kset_last_command, kset_last_kbd_macro) (kset_prefix_arg, kset_system_key_alist, kset_window_system): New setter functions. * keyboard.c (KEYBOARD_INLINE): Define to EXTERN_INLINE, so that the corresponding functions are compiled into code. (kset_echo_string, kset_kbd_queue) (kset_keyboard_translate_table, kset_last_prefix_arg) (kset_last_repeatable_command, kset_local_function_key_map) (kset_overriding_terminal_local_map, kset_real_last_command) (kset_system_key_syms): New setter functions. Fixes: debbugs:12215 --- diff --git a/src/ChangeLog b/src/ChangeLog index 6cb475ef3d7..403f76243a0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,22 @@ 2012-08-17 Paul Eggert + * keyboard.h (KSET): Remove (Bug#12215). + Replace all uses with calls to new setter functions. + Use INLINE_HEADER_BEGIN, INLINE_HEADER_END. + (KEYBOARD_INLINE): New macro. + (kset_default_minibuffer_frame, kset_defining_kbd_macro) + (kset_input_decode_map, kset_last_command, kset_last_kbd_macro) + (kset_prefix_arg, kset_system_key_alist, kset_window_system): + New setter functions. + * keyboard.c (KEYBOARD_INLINE): + Define to EXTERN_INLINE, so that the corresponding functions + are compiled into code. + (kset_echo_string, kset_kbd_queue) + (kset_keyboard_translate_table, kset_last_prefix_arg) + (kset_last_repeatable_command, kset_local_function_key_map) + (kset_overriding_terminal_local_map, kset_real_last_command) + (kset_system_key_syms): New setter functions. + * frame.h (FSET): Remove (Bug#12215). Replace all uses with calls to new setter functions. Use INLINE_HEADER_BEGIN, INLINE_HEADER_END. diff --git a/src/callint.c b/src/callint.c index e0133864674..36a59e812f2 100644 --- a/src/callint.c +++ b/src/callint.c @@ -372,7 +372,7 @@ invoke it. If KEYS is omitted or nil, the return value of Vthis_command = save_this_command; Vthis_original_command = save_this_original_command; Vreal_this_command = save_real_this_command; - KSET (current_kboard, Vlast_command, save_last_command); + kset_last_command (current_kboard, save_last_command); temporarily_switch_to_single_kboard (NULL); return unbind_to (speccount, apply1 (function, specs)); @@ -843,7 +843,7 @@ invoke it. If KEYS is omitted or nil, the return value of Vthis_command = save_this_command; Vthis_original_command = save_this_original_command; Vreal_this_command = save_real_this_command; - KSET (current_kboard, Vlast_command, save_last_command); + kset_last_command (current_kboard, save_last_command); { Lisp_Object val; diff --git a/src/frame.c b/src/frame.c index 0871100da2b..77326df156e 100644 --- a/src/frame.c +++ b/src/frame.c @@ -409,8 +409,8 @@ make_frame_without_minibuffer (register Lisp_Object mini_window, KBOARD *kb, Lis XSETFRAME (frame_dummy, f); GCPRO1 (frame_dummy); /* If there's no minibuffer frame to use, create one. */ - KSET (kb, Vdefault_minibuffer_frame, - call1 (intern ("make-initial-minibuffer-frame"), display)); + kset_default_minibuffer_frame + (kb, call1 (intern ("make-initial-minibuffer-frame"), display)); UNGCPRO; } @@ -864,7 +864,7 @@ to that frame. */) (Lisp_Object event) { /* Preserve prefix arg that the command loop just cleared. */ - KSET (current_kboard, Vprefix_arg, Vcurrent_prefix_arg); + kset_prefix_arg (current_kboard, Vcurrent_prefix_arg); Frun_hooks (1, &Qmouse_leave_buffer_hook); return do_switch_frame (event, 0, 0, Qnil); } @@ -1458,11 +1458,11 @@ delete_frame (Lisp_Object frame, Lisp_Object force) if (NILP (frame_with_minibuf)) abort (); - KSET (kb, Vdefault_minibuffer_frame, frame_with_minibuf); + kset_default_minibuffer_frame (kb, frame_with_minibuf); } else /* No frames left on this kboard--say no minibuffer either. */ - KSET (kb, Vdefault_minibuffer_frame, Qnil); + kset_default_minibuffer_frame (kb, Qnil); } /* Cause frame titles to update--necessary if we now have just one frame. */ diff --git a/src/keyboard.c b/src/keyboard.c index b26a2c88e5d..868d0c8d2c1 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -18,6 +18,9 @@ You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see . */ #include + +#define KEYBOARD_INLINE EXTERN_INLINE + #include #include #include @@ -469,6 +472,53 @@ static void handle_user_signal (int); static char *find_user_signal_name (int); static int store_user_signal_events (void); +/* These setters are used only in this file, so they can be private. */ +static inline void +kset_echo_string (struct kboard *kb, Lisp_Object val) +{ + kb->INTERNAL_FIELD (echo_string) = val; +} +static inline void +kset_kbd_queue (struct kboard *kb, Lisp_Object val) +{ + kb->INTERNAL_FIELD (kbd_queue) = val; +} +static inline void +kset_keyboard_translate_table (struct kboard *kb, Lisp_Object val) +{ + kb->INTERNAL_FIELD (Vkeyboard_translate_table) = val; +} +static inline void +kset_last_prefix_arg (struct kboard *kb, Lisp_Object val) +{ + kb->INTERNAL_FIELD (Vlast_prefix_arg) = val; +} +static inline void +kset_last_repeatable_command (struct kboard *kb, Lisp_Object val) +{ + kb->INTERNAL_FIELD (Vlast_repeatable_command) = val; +} +static inline void +kset_local_function_key_map (struct kboard *kb, Lisp_Object val) +{ + kb->INTERNAL_FIELD (Vlocal_function_key_map) = val; +} +static inline void +kset_overriding_terminal_local_map (struct kboard *kb, Lisp_Object val) +{ + kb->INTERNAL_FIELD (Voverriding_terminal_local_map) = val; +} +static inline void +kset_real_last_command (struct kboard *kb, Lisp_Object val) +{ + kb->INTERNAL_FIELD (Vreal_last_command) = val; +} +static inline void +kset_system_key_syms (struct kboard *kb, Lisp_Object val) +{ + kb->INTERNAL_FIELD (system_key_syms) = val; +} + /* Add C to the echo string, if echoing is going on. C can be a character, which is printed prettily ("M-C-x" and all that @@ -551,8 +601,9 @@ echo_char (Lisp_Object c) else if (STRINGP (echo_string)) echo_string = concat2 (echo_string, build_string (" ")); - KSET (current_kboard, echo_string, - concat2 (echo_string, make_string (buffer, ptr - buffer))); + kset_echo_string + (current_kboard, + concat2 (echo_string, make_string (buffer, ptr - buffer))); echo_now (); } @@ -597,8 +648,9 @@ echo_dash (void) /* Put a dash at the end of the buffer temporarily, but make it go away when the next character is added. */ - KSET (current_kboard, echo_string, - concat2 (KVAR (current_kboard, echo_string), build_string ("-"))); + kset_echo_string + (current_kboard, + concat2 (KVAR (current_kboard, echo_string), build_string ("-"))); echo_now (); } @@ -660,7 +712,7 @@ cancel_echoing (void) { current_kboard->immediate_echo = 0; current_kboard->echo_after_prompt = -1; - KSET (current_kboard, echo_string, Qnil); + kset_echo_string (current_kboard, Qnil); ok_to_echo_at_next_pause = NULL; echo_kboard = NULL; echo_message_buffer = Qnil; @@ -684,9 +736,9 @@ static void echo_truncate (ptrdiff_t nchars) { if (STRINGP (KVAR (current_kboard, echo_string))) - KSET (current_kboard, echo_string, - Fsubstring (KVAR (current_kboard, echo_string), - make_number (0), make_number (nchars))); + kset_echo_string (current_kboard, + Fsubstring (KVAR (current_kboard, echo_string), + make_number (0), make_number (nchars))); truncate_echo_area (nchars); } @@ -1016,8 +1068,8 @@ cmd_error (Lisp_Object data) Vstandard_input = Qt; Vexecuting_kbd_macro = Qnil; executing_kbd_macro = Qnil; - KSET (current_kboard, Vprefix_arg, Qnil); - KSET (current_kboard, Vlast_prefix_arg, Qnil); + kset_prefix_arg (current_kboard, Qnil); + kset_last_prefix_arg (current_kboard, Qnil); cancel_echoing (); /* Avoid unquittable loop if data contains a circular list. */ @@ -1338,8 +1390,8 @@ command_loop_1 (void) #endif int already_adjusted = 0; - KSET (current_kboard, Vprefix_arg, Qnil); - KSET (current_kboard, Vlast_prefix_arg, Qnil); + kset_prefix_arg (current_kboard, Qnil); + kset_last_prefix_arg (current_kboard, Qnil); Vdeactivate_mark = Qnil; waiting_for_input = 0; cancel_echoing (); @@ -1371,10 +1423,10 @@ command_loop_1 (void) } /* Do this after running Vpost_command_hook, for consistency. */ - KSET (current_kboard, Vlast_command, Vthis_command); - KSET (current_kboard, Vreal_last_command, Vreal_this_command); + kset_last_command (current_kboard, Vthis_command); + kset_real_last_command (current_kboard, Vreal_this_command); if (!CONSP (last_command_event)) - KSET (current_kboard, Vlast_repeatable_command, Vreal_this_command); + kset_last_repeatable_command (current_kboard, Vreal_this_command); while (1) { @@ -1546,7 +1598,7 @@ command_loop_1 (void) keys = Fkey_description (keys, Qnil); bitch_at_user (); message_with_string ("%s is undefined", keys, 0); - KSET (current_kboard, defining_kbd_macro, Qnil); + kset_defining_kbd_macro (current_kboard, Qnil); update_mode_lines = 1; /* If this is a down-mouse event, don't reset prefix-arg; pass it to the command run by the up event. */ @@ -1556,10 +1608,10 @@ command_loop_1 (void) = parse_modifiers (EVENT_HEAD (last_command_event)); int modifiers = XINT (XCAR (XCDR (breakdown))); if (!(modifiers & down_modifier)) - KSET (current_kboard, Vprefix_arg, Qnil); + kset_prefix_arg (current_kboard, Qnil); } else - KSET (current_kboard, Vprefix_arg, Qnil); + kset_prefix_arg (current_kboard, Qnil); } else { @@ -1596,7 +1648,7 @@ command_loop_1 (void) unbind_to (scount, Qnil); #endif } - KSET (current_kboard, Vlast_prefix_arg, Vcurrent_prefix_arg); + kset_last_prefix_arg (current_kboard, Vcurrent_prefix_arg); safe_run_hooks (Qpost_command_hook); @@ -1627,10 +1679,10 @@ command_loop_1 (void) if (NILP (KVAR (current_kboard, Vprefix_arg)) || CONSP (last_command_event)) { - KSET (current_kboard, Vlast_command, Vthis_command); - KSET (current_kboard, Vreal_last_command, Vreal_this_command); + kset_last_command (current_kboard, Vthis_command); + kset_real_last_command (current_kboard, Vreal_this_command); if (!CONSP (last_command_event)) - KSET (current_kboard, Vlast_repeatable_command, Vreal_this_command); + kset_last_repeatable_command (current_kboard, Vreal_this_command); cancel_echoing (); this_command_key_count = 0; this_command_key_count_reset = 0; @@ -2573,7 +2625,7 @@ read_char (int commandflag, ptrdiff_t nmaps, Lisp_Object *maps, abort (); } if (!CONSP (last)) - KSET (kb, kbd_queue, Fcons (c, Qnil)); + kset_kbd_queue (kb, Fcons (c, Qnil)); else XSETCDR (last, Fcons (c, Qnil)); kb->kbd_queue_has_data = 1; @@ -2745,8 +2797,8 @@ read_char (int commandflag, ptrdiff_t nmaps, Lisp_Object *maps, if (!CONSP (KVAR (current_kboard, kbd_queue))) abort (); c = XCAR (KVAR (current_kboard, kbd_queue)); - KSET (current_kboard, kbd_queue, - XCDR (KVAR (current_kboard, kbd_queue))); + kset_kbd_queue (current_kboard, + XCDR (KVAR (current_kboard, kbd_queue))); if (NILP (KVAR (current_kboard, kbd_queue))) current_kboard->kbd_queue_has_data = 0; input_pending = readable_events (0); @@ -2813,7 +2865,7 @@ read_char (int commandflag, ptrdiff_t nmaps, Lisp_Object *maps, abort (); } if (!CONSP (last)) - KSET (kb, kbd_queue, Fcons (c, Qnil)); + kset_kbd_queue (kb, Fcons (c, Qnil)); else XSETCDR (last, Fcons (c, Qnil)); kb->kbd_queue_has_data = 1; @@ -3071,7 +3123,7 @@ read_char (int commandflag, ptrdiff_t nmaps, Lisp_Object *maps, cancel_echoing (); ok_to_echo_at_next_pause = saved_ok_to_echo; - KSET (current_kboard, echo_string, saved_echo_string); + kset_echo_string (current_kboard, saved_echo_string); current_kboard->echo_after_prompt = saved_echo_after_prompt; if (saved_immediate_echo) echo_now (); @@ -3542,9 +3594,9 @@ kbd_buffer_store_event_hold (register struct input_event *event, if (single_kboard && kb != current_kboard) { - KSET (kb, kbd_queue, - Fcons (make_lispy_switch_frame (event->frame_or_window), - Fcons (make_number (c), Qnil))); + kset_kbd_queue + (kb, Fcons (make_lispy_switch_frame (event->frame_or_window), + Fcons (make_number (c), Qnil))); kb->kbd_queue_has_data = 1; for (sp = kbd_fetch_ptr; sp != kbd_store_ptr; sp++) { @@ -5416,7 +5468,7 @@ make_lispy_event (struct input_event *event) /* We need to use an alist rather than a vector as the cache since we can't make a vector long enough. */ if (NILP (KVAR (current_kboard, system_key_syms))) - KSET (current_kboard, system_key_syms, Fcons (Qnil, Qnil)); + kset_system_key_syms (current_kboard, Fcons (Qnil, Qnil)); return modify_event_symbol (event->code, event->modifiers, Qfunction_key, @@ -8739,11 +8791,11 @@ read_char_minibuf_menu_prompt (int commandflag, is not used on replay. */ orig_defn_macro = KVAR (current_kboard, defining_kbd_macro); - KSET (current_kboard, defining_kbd_macro, Qnil); + kset_defining_kbd_macro (current_kboard, Qnil); do obj = read_char (commandflag, 0, 0, Qt, 0, NULL); while (BUFFERP (obj)); - KSET (current_kboard, defining_kbd_macro, orig_defn_macro); + kset_defining_kbd_macro (current_kboard, orig_defn_macro); if (!INTEGERP (obj)) return obj; @@ -9099,7 +9151,7 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt, /* Install the string STR as the beginning of the string of echoing, so that it serves as a prompt for the next character. */ - KSET (current_kboard, echo_string, prompt); + kset_echo_string (current_kboard, prompt); current_kboard->echo_after_prompt = SCHARS (prompt); echo_now (); } @@ -9345,15 +9397,17 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt, if (!NILP (delayed_switch_frame)) { - KSET (interrupted_kboard, kbd_queue, - Fcons (delayed_switch_frame, - KVAR (interrupted_kboard, kbd_queue))); + kset_kbd_queue + (interrupted_kboard, + Fcons (delayed_switch_frame, + KVAR (interrupted_kboard, kbd_queue))); delayed_switch_frame = Qnil; } while (t > 0) - KSET (interrupted_kboard, kbd_queue, - Fcons (keybuf[--t], KVAR (interrupted_kboard, kbd_queue))); + kset_kbd_queue + (interrupted_kboard, + Fcons (keybuf[--t], KVAR (interrupted_kboard, kbd_queue))); /* If the side queue is non-empty, ensure it begins with a switch-frame, so we'll replay it in the right context. */ @@ -9365,9 +9419,10 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt, { Lisp_Object frame; XSETFRAME (frame, interrupted_frame); - KSET (interrupted_kboard, kbd_queue, - Fcons (make_lispy_switch_frame (frame), - KVAR (interrupted_kboard, kbd_queue))); + kset_kbd_queue + (interrupted_kboard, + Fcons (make_lispy_switch_frame (frame), + KVAR (interrupted_kboard, kbd_queue))); } mock_input = 0; orig_local_map = get_local_map (PT, current_buffer, Qlocal_map); @@ -10261,7 +10316,7 @@ a special event, so ignore the prefix argument and don't clear it. */) { prefixarg = KVAR (current_kboard, Vprefix_arg); Vcurrent_prefix_arg = prefixarg; - KSET (current_kboard, Vprefix_arg, Qnil); + kset_prefix_arg (current_kboard, Qnil); } else prefixarg = Qnil; @@ -11256,30 +11311,30 @@ The `posn-' functions access elements of such lists. */) void init_kboard (KBOARD *kb) { - KSET (kb, Voverriding_terminal_local_map, Qnil); - KSET (kb, Vlast_command, Qnil); - KSET (kb, Vreal_last_command, Qnil); - KSET (kb, Vkeyboard_translate_table, Qnil); - KSET (kb, Vlast_repeatable_command, Qnil); - KSET (kb, Vprefix_arg, Qnil); - KSET (kb, Vlast_prefix_arg, Qnil); - KSET (kb, kbd_queue, Qnil); + kset_overriding_terminal_local_map (kb, Qnil); + kset_last_command (kb, Qnil); + kset_real_last_command (kb, Qnil); + kset_keyboard_translate_table (kb, Qnil); + kset_last_repeatable_command (kb, Qnil); + kset_prefix_arg (kb, Qnil); + kset_last_prefix_arg (kb, Qnil); + kset_kbd_queue (kb, Qnil); kb->kbd_queue_has_data = 0; kb->immediate_echo = 0; - KSET (kb, echo_string, Qnil); + kset_echo_string (kb, Qnil); kb->echo_after_prompt = -1; kb->kbd_macro_buffer = 0; kb->kbd_macro_bufsize = 0; - KSET (kb, defining_kbd_macro, Qnil); - KSET (kb, Vlast_kbd_macro, Qnil); + kset_defining_kbd_macro (kb, Qnil); + kset_last_kbd_macro (kb, Qnil); kb->reference_count = 0; - KSET (kb, Vsystem_key_alist, Qnil); - KSET (kb, system_key_syms, Qnil); - KSET (kb, Vwindow_system, Qt); /* Unset. */ - KSET (kb, Vinput_decode_map, Fmake_sparse_keymap (Qnil)); - KSET (kb, Vlocal_function_key_map, Fmake_sparse_keymap (Qnil)); + kset_system_key_alist (kb, Qnil); + kset_system_key_syms (kb, Qnil); + kset_window_system (kb, Qt); /* Unset. */ + kset_input_decode_map (kb, Fmake_sparse_keymap (Qnil)); + kset_local_function_key_map (kb, Fmake_sparse_keymap (Qnil)); Fset_keymap_parent (KVAR (kb, Vlocal_function_key_map), Vfunction_key_map); - KSET (kb, Vdefault_minibuffer_frame, Qnil); + kset_default_minibuffer_frame (kb, Qnil); } /* @@ -11355,7 +11410,7 @@ init_keyboard (void) init_kboard (current_kboard); /* A value of nil for Vwindow_system normally means a tty, but we also use it for the initial terminal since there is no window system there. */ - KSET (current_kboard, Vwindow_system, Qnil); + kset_window_system (current_kboard, Qnil); if (!noninteractive) { diff --git a/src/keyboard.h b/src/keyboard.h index f83643d6f6e..91484b3649b 100644 --- a/src/keyboard.h +++ b/src/keyboard.h @@ -19,10 +19,14 @@ along with GNU Emacs. If not, see . */ #include "systime.h" /* for EMACS_TIME, Time */ #include "coding.h" /* for ENCODE_UTF_8 and ENCODE_SYSTEM */ +INLINE_HEADER_BEGIN +#ifndef KEYBOARD_INLINE +# define KEYBOARD_INLINE INLINE +#endif + /* Most code should use this macro to access Lisp fields in struct kboard. */ #define KVAR(kboard, field) ((kboard)->INTERNAL_FIELD (field)) -#define KSET(kboard, field, value) ((kboard)->INTERNAL_FIELD (field) = (value)) /* Each KBOARD represents one logical input stream from which Emacs gets input. If we are using ordinary terminals, it has one KBOARD @@ -173,6 +177,47 @@ struct kboard char echo_after_prompt; }; +KEYBOARD_INLINE void +kset_default_minibuffer_frame (struct kboard *kb, Lisp_Object val) +{ + kb->INTERNAL_FIELD (Vdefault_minibuffer_frame) = val; +} +KEYBOARD_INLINE void +kset_defining_kbd_macro (struct kboard *kb, Lisp_Object val) +{ + kb->INTERNAL_FIELD (defining_kbd_macro) = val; +} +KEYBOARD_INLINE void +kset_input_decode_map (struct kboard *kb, Lisp_Object val) +{ + kb->INTERNAL_FIELD (Vinput_decode_map) = val; +} +KEYBOARD_INLINE void +kset_last_command (struct kboard *kb, Lisp_Object val) +{ + kb->INTERNAL_FIELD (Vlast_command) = val; +} +KEYBOARD_INLINE void +kset_last_kbd_macro (struct kboard *kb, Lisp_Object val) +{ + kb->INTERNAL_FIELD (Vlast_kbd_macro) = val; +} +KEYBOARD_INLINE void +kset_prefix_arg (struct kboard *kb, Lisp_Object val) +{ + kb->INTERNAL_FIELD (Vprefix_arg) = val; +} +KEYBOARD_INLINE void +kset_system_key_alist (struct kboard *kb, Lisp_Object val) +{ + kb->INTERNAL_FIELD (Vsystem_key_alist) = val; +} +KEYBOARD_INLINE void +kset_window_system (struct kboard *kb, Lisp_Object val) +{ + kb->INTERNAL_FIELD (Vwindow_system) = val; +} + /* Temporarily used before a frame has been opened. */ extern KBOARD *initial_kboard; @@ -510,3 +555,5 @@ extern void mark_kboards (void); #ifdef WINDOWSNT extern const char *const lispy_function_keys[]; #endif + +INLINE_HEADER_END diff --git a/src/macros.c b/src/macros.c index d74d12e6158..e81068181b9 100644 --- a/src/macros.c +++ b/src/macros.c @@ -127,7 +127,7 @@ macro before appending to it. */) message ("Appending to kbd macro..."); } - KSET (current_kboard, defining_kbd_macro, Qt); + kset_defining_kbd_macro (current_kboard, Qt); return Qnil; } @@ -137,12 +137,13 @@ macro before appending to it. */) void end_kbd_macro (void) { - KSET (current_kboard, defining_kbd_macro, Qnil); + kset_defining_kbd_macro (current_kboard, Qnil); update_mode_lines++; - KSET (current_kboard, Vlast_kbd_macro, - make_event_array ((current_kboard->kbd_macro_end - - current_kboard->kbd_macro_buffer), - current_kboard->kbd_macro_buffer)); + kset_last_kbd_macro + (current_kboard, + make_event_array ((current_kboard->kbd_macro_end + - current_kboard->kbd_macro_buffer), + current_kboard->kbd_macro_buffer)); } DEFUN ("end-kbd-macro", Fend_kbd_macro, Send_kbd_macro, 0, 2, "p", @@ -330,7 +331,7 @@ each iteration of the macro. Iteration stops if LOOPFUNC returns nil. */) executing_kbd_macro = final; executing_kbd_macro_index = 0; - KSET (current_kboard, Vprefix_arg, Qnil); + kset_prefix_arg (current_kboard, Qnil); if (!NILP (loopfunc)) { diff --git a/src/msdos.c b/src/msdos.c index bcb7fbe75e0..30435820d9e 100644 --- a/src/msdos.c +++ b/src/msdos.c @@ -520,8 +520,8 @@ dos_set_window_size (int *rows, int *cols) /* If the user specified a special video mode for these dimensions, use that mode. */ - video_mode - = Fsymbol_value (Fintern_soft (make_formatted_string + video_mode + = Fsymbol_value (Fintern_soft (make_formatted_string (video_name, "screen-dimensions-%dx%d", *rows, *cols), Qnil)); @@ -1801,7 +1801,7 @@ internal_terminal_init (void) } tty = FRAME_TTY (sf); - KSET (current_kboard, Vwindow_system, Qpc); + kset_window_system (current_kboard, Qpc); sf->output_method = output_msdos_raw; if (init_needed) { diff --git a/src/nsfns.m b/src/nsfns.m index abfcb71cbfc..e8b5d22077a 100644 --- a/src/nsfns.m +++ b/src/nsfns.m @@ -1391,7 +1391,7 @@ This function is an internal primitive--use `make-frame' instead. */) if (FRAME_HAS_MINIBUF_P (f) && (!FRAMEP (KVAR (kb, Vdefault_minibuffer_frame)) || !FRAME_LIVE_P (XFRAME (KVAR (kb, Vdefault_minibuffer_frame))))) - KSET (kb, Vdefault_minibuffer_frame, frame); + kset_default_minibuffer_frame (kb, frame); /* All remaining specified parameters, which have not been "used" by x_get_arg and friends, now go in the misc. alist of the frame. */ diff --git a/src/nsterm.m b/src/nsterm.m index 137ad299ddd..75877b1ee91 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -4093,7 +4093,7 @@ ns_term_init (Lisp_Object display_name) terminal->kboard = xmalloc (sizeof *terminal->kboard); init_kboard (terminal->kboard); - KSET (terminal->kboard, Vwindow_system, Qns); + kset_window_system (terminal->kboard, Qns); terminal->kboard->next_kboard = all_kboards; all_kboards = terminal->kboard; /* Don't let the initial kboard remain current longer than necessary. diff --git a/src/term.c b/src/term.c index c5cec3062e3..23e074287c1 100644 --- a/src/term.c +++ b/src/term.c @@ -1332,7 +1332,7 @@ term_get_fkeys_1 (void) /* This can happen if CANNOT_DUMP or with strange options. */ if (!KEYMAPP (KVAR (kboard, Vinput_decode_map))) - KSET (kboard, Vinput_decode_map, Fmake_sparse_keymap (Qnil)); + kset_input_decode_map (kboard, Fmake_sparse_keymap (Qnil)); for (i = 0; i < (sizeof (keys)/sizeof (keys[0])); i++) { @@ -3280,7 +3280,7 @@ use the Bourne shell command `TERM=... export TERM' (C-shell:\n\ terminal->kboard = xmalloc (sizeof *terminal->kboard); init_kboard (terminal->kboard); - KSET (terminal->kboard, Vwindow_system, Qnil); + kset_window_system (terminal->kboard, Qnil); terminal->kboard->next_kboard = all_kboards; all_kboards = terminal->kboard; terminal->kboard->reference_count++; diff --git a/src/w32fns.c b/src/w32fns.c index 3f84823c366..3b35147d3ca 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -4381,7 +4381,7 @@ This function is an internal primitive--use `make-frame' instead. */) if (FRAME_HAS_MINIBUF_P (f) && (!FRAMEP (KVAR (kb, Vdefault_minibuffer_frame)) || !FRAME_LIVE_P (XFRAME (KVAR (kb, Vdefault_minibuffer_frame))))) - KSET (kb, Vdefault_minibuffer_frame, frame); + kset_default_minibuffer_frame (kb, frame); /* All remaining specified parameters, which have not been "used" by x_get_arg and friends, now go in the misc. alist of the frame. */ diff --git a/src/w32term.c b/src/w32term.c index a74dfbc3bd2..9b7dc896aaf 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -6232,7 +6232,7 @@ w32_create_terminal (struct w32_display_info *dpyinfo) terminal like X does. */ terminal->kboard = xmalloc (sizeof (KBOARD)); init_kboard (terminal->kboard); - KSET (terminal->kboard, Vwindow_system, intern ("w32")); + kset_window_system (terminal->kboard, intern ("w32")); terminal->kboard->next_kboard = all_kboards; all_kboards = terminal->kboard; /* Don't let the initial kboard remain current longer than necessary. diff --git a/src/xfns.c b/src/xfns.c index 7960a42709b..f4c7f4714a4 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -3455,7 +3455,7 @@ This function is an internal primitive--use `make-frame' instead. */) if (FRAME_HAS_MINIBUF_P (f) && (!FRAMEP (KVAR (kb, Vdefault_minibuffer_frame)) || !FRAME_LIVE_P (XFRAME (KVAR (kb, Vdefault_minibuffer_frame))))) - KSET (kb, Vdefault_minibuffer_frame, frame); + kset_default_minibuffer_frame (kb, frame); /* All remaining specified parameters, which have not been "used" by x_get_arg and friends, now go in the misc. alist of the frame. */ diff --git a/src/xterm.c b/src/xterm.c index 715e3664ec2..6a195543ed7 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -7834,7 +7834,7 @@ x_connection_closed (Display *dpy, const char *error_message) { /* Set this to t so that delete_frame won't get confused trying to find a replacement. */ - KSET (FRAME_KBOARD (XFRAME (frame)), Vdefault_minibuffer_frame, Qt); + kset_default_minibuffer_frame (FRAME_KBOARD (XFRAME (frame)), Qt); delete_frame (frame, Qnoelisp); } @@ -10114,7 +10114,7 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name) { terminal->kboard = xmalloc (sizeof *terminal->kboard); init_kboard (terminal->kboard); - KSET (terminal->kboard, Vwindow_system, Qx); + kset_window_system (terminal->kboard, Qx); /* Add the keyboard to the list before running Lisp code (via Qvendor_specific_keysyms below), since these are not traced @@ -10136,9 +10136,10 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name) /* Temporarily hide the partially initialized terminal. */ terminal_list = terminal->next_terminal; UNBLOCK_INPUT; - KSET (terminal->kboard, Vsystem_key_alist, - call1 (Qvendor_specific_keysyms, - vendor ? build_string (vendor) : empty_unibyte_string)); + kset_system_key_alist + (terminal->kboard, + call1 (Qvendor_specific_keysyms, + vendor ? build_string (vendor) : empty_unibyte_string)); BLOCK_INPUT; terminal->next_terminal = terminal_list; terminal_list = terminal;