From 9a274fbd38630b262b3226c4bb1d353c722e6ed9 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Wed, 14 May 2003 18:52:13 +0000 Subject: [PATCH] (Qwindowp, Qwindow_live_p, Vwindow_list) (Fwindow_end, Fselected_window, Fdelete_window, Fwindow_buffer) (Fget_buffer_window, Fsave_window_excursion, Fsplit_window) (Fset_window_configuration, Fcurrent_window_configuration) (compare_window_configurations, Fcoordinates_in_window_p, Fwindow_at) (Fpos_visible_in_window_p, mark_window_cursors_off) (window_internal_height, window_internal_width, Frecenter) (Fscroll_other_window, Fset_window_start, temp_output_buffer_show) (replace_buffer_in_all_windows, init_window_once, init_window) (syms_of_window, keys_of_window): Move from lisp.h to window.h. --- src/ChangeLog | 22 ++++++++++++++++++++++ src/lisp.h | 32 -------------------------------- src/window.h | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 32 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 197631eef52..a392195fde6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,25 @@ +2003-05-14 Stefan Monnier + + * window.h (Qwindowp, Qwindow_live_p, Vwindow_list) + (Fwindow_end, Fselected_window, Fdelete_window, Fwindow_buffer) + (Fget_buffer_window, Fsave_window_excursion, Fsplit_window) + (Fset_window_configuration, Fcurrent_window_configuration) + (compare_window_configurations, Fcoordinates_in_window_p, Fwindow_at) + (Fpos_visible_in_window_p, mark_window_cursors_off) + (window_internal_height, window_internal_width, Frecenter) + (Fscroll_other_window, Fset_window_start, temp_output_buffer_show) + (replace_buffer_in_all_windows, init_window_once, init_window) + (syms_of_window, keys_of_window): Move from lisp.h. + * lisp.h: Move window.c declarations to window.h. + + * bytecode.c: Include window.h. + * emacs.c: Include window.h. + + * keyboard.c (make_lispy_event): Apply modifiers to multibyte-char keys. + (keyremap): Add `parent' field. + (keyremap_step): Use it. Remove `parent' argument. + (read_key_sequence): Setup and use the new `parent' field. + 2003-05-11 Stefan Monnier * keyboard.c (adjust_point_for_property): Ensure termination. diff --git a/src/lisp.h b/src/lisp.h index d455e3c464f..7bd4c6af771 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -2875,38 +2875,6 @@ extern void invalidate_current_column P_ ((void)); extern int indented_beyond_p P_ ((int, int, double)); extern void syms_of_indent P_ ((void)); -/* defined in window.c */ -extern Lisp_Object Qwindowp, Qwindow_live_p; -extern Lisp_Object Vwindow_list; -EXFUN (Fwindow_end, 2); -EXFUN (Fselected_window, 0); -EXFUN (Fnext_window, 3); -EXFUN (Fdelete_window, 1); -EXFUN (Fselect_window, 1); -EXFUN (Fset_window_buffer, 2); -EXFUN (Fwindow_buffer, 1); -EXFUN (Fget_buffer_window, 2); -EXFUN (Fsave_window_excursion, UNEVALLED); -EXFUN (Fsplit_window, 3); -EXFUN (Fset_window_configuration, 1); -EXFUN (Fcurrent_window_configuration, 1); -extern int compare_window_configurations P_ ((Lisp_Object, Lisp_Object, int)); -EXFUN (Fcoordinates_in_window_p, 2); -EXFUN (Fwindow_at, 3); -EXFUN (Fpos_visible_in_window_p, 3); -extern void mark_window_cursors_off P_ ((struct window *)); -extern int window_internal_height P_ ((struct window *)); -extern int window_internal_width P_ ((struct window *)); -EXFUN (Frecenter, 1); -EXFUN (Fscroll_other_window, 1); -EXFUN (Fset_window_start, 3); -extern void temp_output_buffer_show P_ ((Lisp_Object)); -extern void replace_buffer_in_all_windows P_ ((Lisp_Object)); -extern void init_window_once P_ ((void)); -extern void init_window P_ ((void)); -extern void syms_of_window P_ ((void)); -extern void keys_of_window P_ ((void)); - /* defined in frame.c */ extern Lisp_Object Qvisible; extern void store_frame_param P_ ((struct frame *, Lisp_Object, Lisp_Object)); diff --git a/src/window.h b/src/window.h index 50357d3494b..ed5bc6b14b1 100644 --- a/src/window.h +++ b/src/window.h @@ -463,4 +463,37 @@ struct glyph *get_phys_cursor_glyph P_ ((struct window *w)); #define WINDOW_LIVE_P(WINDOW) \ (WINDOWP ((WINDOW)) && !NILP (XWINDOW ((WINDOW))->buffer)) + +/* These used to be in lisp.h. */ + +extern Lisp_Object Qwindowp, Qwindow_live_p; +extern Lisp_Object Vwindow_list; + +EXFUN (Fwindow_end, 2); +EXFUN (Fselected_window, 0); +EXFUN (Fdelete_window, 1); +EXFUN (Fwindow_buffer, 1); +EXFUN (Fget_buffer_window, 2); +EXFUN (Fsave_window_excursion, UNEVALLED); +EXFUN (Fsplit_window, 3); +EXFUN (Fset_window_configuration, 1); +EXFUN (Fcurrent_window_configuration, 1); +extern int compare_window_configurations P_ ((Lisp_Object, Lisp_Object, int)); +EXFUN (Fcoordinates_in_window_p, 2); +EXFUN (Fwindow_at, 3); +EXFUN (Fpos_visible_in_window_p, 3); +extern void mark_window_cursors_off P_ ((struct window *)); +extern int window_internal_height P_ ((struct window *)); +extern int window_internal_width P_ ((struct window *)); +EXFUN (Frecenter, 1); +EXFUN (Fscroll_other_window, 1); +EXFUN (Fset_window_start, 3); +extern void temp_output_buffer_show P_ ((Lisp_Object)); +extern void replace_buffer_in_all_windows P_ ((Lisp_Object)); +extern void init_window_once P_ ((void)); +extern void init_window P_ ((void)); +extern void syms_of_window P_ ((void)); +extern void keys_of_window P_ ((void)); + + #endif /* not WINDOW_H_INCLUDED */ -- 2.39.2