aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKim F. Storm2002-02-28 22:07:45 +0000
committerKim F. Storm2002-02-28 22:07:45 +0000
commit3dbab091cb2cc8a5af53dcf9b5a24bec3135d712 (patch)
tree9870f362333beaf435c7e0e0fb9c5f985d771182 /src
parenta0164df52c6668172dca26519b9cf526d296c368 (diff)
downloademacs-3dbab091cb2cc8a5af53dcf9b5a24bec3135d712.tar.gz
emacs-3dbab091cb2cc8a5af53dcf9b5a24bec3135d712.zip
(minibuf_selected_window): Renamed from
Vminibuf_selected_window. Users changed. (syms_of_window): Staticpro it.
Diffstat (limited to 'src')
-rw-r--r--src/window.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/window.c b/src/window.c
index 3e07ea2a4a8..562b69604dc 100644
--- a/src/window.c
+++ b/src/window.c
@@ -123,7 +123,7 @@ Lisp_Object minibuf_window;
123/* Non-nil means it is the window whose mode line should be 123/* Non-nil means it is the window whose mode line should be
124 shown as the selected window when the minibuffer is selected. */ 124 shown as the selected window when the minibuffer is selected. */
125 125
126Lisp_Object Vminibuf_selected_window; 126Lisp_Object minibuf_selected_window;
127 127
128/* Non-nil means it is the window for C-M-v to scroll 128/* Non-nil means it is the window for C-M-v to scroll
129 when the mini-buffer is selected. */ 129 when the mini-buffer is selected. */
@@ -5162,7 +5162,7 @@ the return value is nil. Otherwise the value is t. */)
5162 window_min_width = XINT (data->min_width); 5162 window_min_width = XINT (data->min_width);
5163 5163
5164 Vminibuf_scroll_window = data->minibuf_scroll_window; 5164 Vminibuf_scroll_window = data->minibuf_scroll_window;
5165 Vminibuf_selected_window = data->minibuf_selected_window; 5165 minibuf_selected_window = data->minibuf_selected_window;
5166 5166
5167 return (FRAME_LIVE_P (f) ? Qt : Qnil); 5167 return (FRAME_LIVE_P (f) ? Qt : Qnil);
5168} 5168}
@@ -5373,7 +5373,7 @@ redirection (see `redirect-frame-focus'). */)
5373 data->current_window = FRAME_SELECTED_WINDOW (f); 5373 data->current_window = FRAME_SELECTED_WINDOW (f);
5374 XSETBUFFER (data->current_buffer, current_buffer); 5374 XSETBUFFER (data->current_buffer, current_buffer);
5375 data->minibuf_scroll_window = minibuf_level > 0 ? Vminibuf_scroll_window : Qnil; 5375 data->minibuf_scroll_window = minibuf_level > 0 ? Vminibuf_scroll_window : Qnil;
5376 data->minibuf_selected_window = minibuf_level > 0 ? Vminibuf_selected_window : Qnil; 5376 data->minibuf_selected_window = minibuf_level > 0 ? minibuf_selected_window : Qnil;
5377 data->root_window = FRAME_ROOT_WINDOW (f); 5377 data->root_window = FRAME_ROOT_WINDOW (f);
5378 data->focus_frame = FRAME_FOCUS_FRAME (f); 5378 data->focus_frame = FRAME_FOCUS_FRAME (f);
5379 XSETINT (data->min_height, window_min_height); 5379 XSETINT (data->min_height, window_min_height);
@@ -5787,6 +5787,7 @@ syms_of_window ()
5787 staticpro (&Qtemp_buffer_show_hook); 5787 staticpro (&Qtemp_buffer_show_hook);
5788 5788
5789 staticpro (&Vwindow_list); 5789 staticpro (&Vwindow_list);
5790 staticpro (&minibuf_selected_window);
5790 5791
5791 DEFVAR_LISP ("temp-buffer-show-function", &Vtemp_buffer_show_function, 5792 DEFVAR_LISP ("temp-buffer-show-function", &Vtemp_buffer_show_function,
5792 doc: /* Non-nil means call as function to display a help buffer. 5793 doc: /* Non-nil means call as function to display a help buffer.