diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-08-17 16:38:43 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-08-17 16:38:43 -0700 |
| commit | 15dbb4d6ba5dea7d3e0f45ab3fd038c2b305a145 (patch) | |
| tree | 2b8f35fcfd05d43551b873d4390264768f099dfb /src/macros.c | |
| parent | f00af5b1c24515f20f96cfd8d59983ab62fb3f25 (diff) | |
| download | emacs-15dbb4d6ba5dea7d3e0f45ab3fd038c2b305a145.tar.gz | |
* 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/macros.c')
| -rw-r--r-- | src/macros.c | 15 |
1 files changed, 8 insertions, 7 deletions
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)) { |