aboutsummaryrefslogtreecommitdiffstats
path: root/src/window.c
diff options
context:
space:
mode:
authorTom Tromey2011-02-16 09:35:16 -0700
committerTom Tromey2011-02-16 09:35:16 -0700
commit1344aad491d0951920efef6cae1c6934f92cd59b (patch)
treed251eb2e3842b09f1d269e0586668aa0e509f211 /src/window.c
parenteb4916d71a6a4293b1dd51deb19cf267bb62b7ae (diff)
downloademacs-1344aad491d0951920efef6cae1c6934f92cd59b.tar.gz
emacs-1344aad491d0951920efef6cae1c6934f92cd59b.zip
Hide implementation of `struct kboard'
* callint.c (Fcall_interactively): Update. * doc.c (Fsubstitute_command_keys): Update. * cmds.c (Fself_insert_command): Update. * keymap.c (Fcurrent_active_maps, Fkey_binding) (Fdescribe_buffer_bindings): Update. * macros.c (Fstart_kbd_macro, end_kbd_macro, Fend_kbd_macro) (store_kbd_macro_char, Fcall_last_kbd_macro, Fexecute_kbd_macro): Update. * keyboard.c (echo_char, echo_dash, echo_now, cancel_echoing) (echo_length, echo_truncate, cmd_error, command_loop_1) (read_char, kbd_buffer_store_event_hold, make_lispy_event) (menu_bar_items, tool_bar_items, read_char_minibuf_menu_prompt) (read_key_sequence, Fcommand_execute, Fexecute_extended_command) (Fdiscard_input, init_kboard, init_keyboard, mark_kboards): Update. * xfns.c (Fx_create_frame): Update. * xterm.c (x_connection_closed, x_term_init): Update. * term.c (term_get_fkeys_1, CONDITIONAL_REASSIGN, init_tty): Update. * window.c (window_scroll_pixel_based, window_scroll_line_based): Update. * frame.c (make_frame_without_minibuffer, Fhandle_switch_frame) (delete_frame): Update. * lisp.h (DEFVAR_KBOARD): Update for change to field names. * keyboard.h (struct kboard): Rename all Lisp_Object fields. (KBOARD_INTERNAL_FIELD, KVAR): New macros.
Diffstat (limited to 'src/window.c')
-rw-r--r--src/window.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/window.c b/src/window.c
index 675a493e18e..7965269f0e7 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4834,8 +4834,8 @@ window_scroll_pixel_based (Lisp_Object window, int n, int whole, int noerror)
4834 possibility of point becoming "stuck" on a tall line when 4834 possibility of point becoming "stuck" on a tall line when
4835 scrolling by one line. */ 4835 scrolling by one line. */
4836 if (window_scroll_pixel_based_preserve_y < 0 4836 if (window_scroll_pixel_based_preserve_y < 0
4837 || !SYMBOLP (current_kboard->Vlast_command) 4837 || !SYMBOLP (KVAR (current_kboard, Vlast_command))
4838 || NILP (Fget (current_kboard->Vlast_command, Qscroll_command))) 4838 || NILP (Fget (KVAR (current_kboard, Vlast_command), Qscroll_command)))
4839 { 4839 {
4840 start_display (&it, w, start); 4840 start_display (&it, w, start);
4841 move_it_to (&it, PT, -1, -1, -1, MOVE_TO_POS); 4841 move_it_to (&it, PT, -1, -1, -1, MOVE_TO_POS);
@@ -5091,8 +5091,8 @@ window_scroll_line_based (Lisp_Object window, int n, int whole, int noerror)
5091 if (!NILP (Vscroll_preserve_screen_position)) 5091 if (!NILP (Vscroll_preserve_screen_position))
5092 { 5092 {
5093 if (window_scroll_preserve_vpos <= 0 5093 if (window_scroll_preserve_vpos <= 0
5094 || !SYMBOLP (current_kboard->Vlast_command) 5094 || !SYMBOLP (KVAR (current_kboard, Vlast_command))
5095 || NILP (Fget (current_kboard->Vlast_command, Qscroll_command))) 5095 || NILP (Fget (KVAR (current_kboard, Vlast_command), Qscroll_command)))
5096 { 5096 {
5097 struct position posit 5097 struct position posit
5098 = *compute_motion (startpos, 0, 0, 0, 5098 = *compute_motion (startpos, 0, 0, 0,