aboutsummaryrefslogtreecommitdiffstats
path: root/src/window.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/window.c')
-rw-r--r--src/window.c22
1 files changed, 1 insertions, 21 deletions
diff --git a/src/window.c b/src/window.c
index 45dfb9ea1c2..b508988953f 100644
--- a/src/window.c
+++ b/src/window.c
@@ -45,20 +45,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
45#include "msdos.h" 45#include "msdos.h"
46#endif 46#endif
47 47
48Lisp_Object Qwindowp, Qwindow_live_p;
49static Lisp_Object Qwindow_valid_p;
50static Lisp_Object Qwindow_configuration_p;
51static Lisp_Object Qrecord_window_buffer;
52static Lisp_Object Qwindow_deletable_p, Qdelete_window, Qdisplay_buffer;
53static Lisp_Object Qreplace_buffer_in_windows, Qget_mru_window;
54static Lisp_Object Qwindow_resize_root_window, Qwindow_resize_root_window_vertically;
55static Lisp_Object Qwindow_sanitize_window_sizes;
56static Lisp_Object Qwindow_pixel_to_total;
57static Lisp_Object Qscroll_up, Qscroll_down, Qscroll_command;
58static Lisp_Object Qsafe, Qabove, Qbelow, Qwindow_size, Qclone_of;
59static Lisp_Object Qfloor, Qceiling;
60static Lisp_Object Qwindow_point_insertion_type;
61
62static int displayed_window_lines (struct window *); 48static int displayed_window_lines (struct window *);
63static int count_windows (struct window *); 49static int count_windows (struct window *);
64static int get_leaf_windows (struct window *, struct window **, int); 50static int get_leaf_windows (struct window *, struct window **, int);
@@ -115,15 +101,9 @@ Lisp_Object minibuf_window;
115 shown as the selected window when the minibuffer is selected. */ 101 shown as the selected window when the minibuffer is selected. */
116Lisp_Object minibuf_selected_window; 102Lisp_Object minibuf_selected_window;
117 103
118/* Hook run at end of temp_output_buffer_show. */
119static Lisp_Object Qtemp_buffer_show_hook;
120
121/* Incremented for each window created. */ 104/* Incremented for each window created. */
122static int sequence_number; 105static int sequence_number;
123 106
124/* Hook to run when window config changes. */
125static Lisp_Object Qwindow_configuration_change_hook;
126
127/* Used by the function window_scroll_pixel_based. */ 107/* Used by the function window_scroll_pixel_based. */
128static int window_scroll_pixel_based_preserve_x; 108static int window_scroll_pixel_based_preserve_x;
129static int window_scroll_pixel_based_preserve_y; 109static int window_scroll_pixel_based_preserve_y;
@@ -3653,7 +3633,7 @@ temp_output_buffer_show (register Lisp_Object buf)
3653 record_unwind_protect (select_window_norecord, prev_window); 3633 record_unwind_protect (select_window_norecord, prev_window);
3654 Fselect_window (window, Qt); 3634 Fselect_window (window, Qt);
3655 Fset_buffer (w->contents); 3635 Fset_buffer (w->contents);
3656 Frun_hooks (1, &Qtemp_buffer_show_hook); 3636 run_hook (Qtemp_buffer_show_hook);
3657 unbind_to (count, Qnil); 3637 unbind_to (count, Qnil);
3658 } 3638 }
3659 } 3639 }