aboutsummaryrefslogtreecommitdiffstats
path: root/src/term.c
diff options
context:
space:
mode:
authorPaul Eggert2012-08-17 16:38:43 -0700
committerPaul Eggert2012-08-17 16:38:43 -0700
commit15dbb4d6ba5dea7d3e0f45ab3fd038c2b305a145 (patch)
tree2b8f35fcfd05d43551b873d4390264768f099dfb /src/term.c
parentf00af5b1c24515f20f96cfd8d59983ab62fb3f25 (diff)
downloademacs-15dbb4d6ba5dea7d3e0f45ab3fd038c2b305a145.tar.gz
emacs-15dbb4d6ba5dea7d3e0f45ab3fd038c2b305a145.zip
* 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
Diffstat (limited to 'src/term.c')
-rw-r--r--src/term.c4
1 files changed, 2 insertions, 2 deletions
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)
1332 1332
1333 /* This can happen if CANNOT_DUMP or with strange options. */ 1333 /* This can happen if CANNOT_DUMP or with strange options. */
1334 if (!KEYMAPP (KVAR (kboard, Vinput_decode_map))) 1334 if (!KEYMAPP (KVAR (kboard, Vinput_decode_map)))
1335 KSET (kboard, Vinput_decode_map, Fmake_sparse_keymap (Qnil)); 1335 kset_input_decode_map (kboard, Fmake_sparse_keymap (Qnil));
1336 1336
1337 for (i = 0; i < (sizeof (keys)/sizeof (keys[0])); i++) 1337 for (i = 0; i < (sizeof (keys)/sizeof (keys[0])); i++)
1338 { 1338 {
@@ -3280,7 +3280,7 @@ use the Bourne shell command `TERM=... export TERM' (C-shell:\n\
3280 3280
3281 terminal->kboard = xmalloc (sizeof *terminal->kboard); 3281 terminal->kboard = xmalloc (sizeof *terminal->kboard);
3282 init_kboard (terminal->kboard); 3282 init_kboard (terminal->kboard);
3283 KSET (terminal->kboard, Vwindow_system, Qnil); 3283 kset_window_system (terminal->kboard, Qnil);
3284 terminal->kboard->next_kboard = all_kboards; 3284 terminal->kboard->next_kboard = all_kboards;
3285 all_kboards = terminal->kboard; 3285 all_kboards = terminal->kboard;
3286 terminal->kboard->reference_count++; 3286 terminal->kboard->reference_count++;