(minibuf_selected_window): Renamed from

Vminibuf_selected_window.  Users changed.
(syms_of_window): Staticpro it.

diff --git a/src/window.c b/src/window.c
index 3e07ea2a4a85aeff58c30852e3781a55c7914679..562b69604dc572dc9e5d3f7d9f6da996f8b47492 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -123,7 +123,7 @@ Lisp_Object minibuf_window;
 /* Non-nil means it is the window whose mode line should be
    shown as the selected window when the minibuffer is selected.  */
 
-Lisp_Object Vminibuf_selected_window;
+Lisp_Object minibuf_selected_window;
 
 /* Non-nil means it is the window for C-M-v to scroll
    when the mini-buffer is selected.  */
@@ -5162,7 +5162,7 @@ the return value is nil.  Otherwise the value is t.  */)
   window_min_width = XINT (data->min_width);
 
   Vminibuf_scroll_window = data->minibuf_scroll_window;
-  Vminibuf_selected_window = data->minibuf_selected_window;
+  minibuf_selected_window = data->minibuf_selected_window;
 
   return (FRAME_LIVE_P (f) ? Qt : Qnil);
 }
@@ -5373,7 +5373,7 @@ redirection (see `redirect-frame-focus').  */)
   data->current_window = FRAME_SELECTED_WINDOW (f);
   XSETBUFFER (data->current_buffer, current_buffer);
   data->minibuf_scroll_window = minibuf_level > 0 ? Vminibuf_scroll_window : Qnil;
-  data->minibuf_selected_window = minibuf_level > 0 ? Vminibuf_selected_window : Qnil;
+  data->minibuf_selected_window = minibuf_level > 0 ? minibuf_selected_window : Qnil;
   data->root_window = FRAME_ROOT_WINDOW (f);
   data->focus_frame = FRAME_FOCUS_FRAME (f);
   XSETINT (data->min_height, window_min_height);
@@ -5787,6 +5787,7 @@ syms_of_window ()
   staticpro (&Qtemp_buffer_show_hook);
 
   staticpro (&Vwindow_list);
+  staticpro (&minibuf_selected_window);
 
   DEFVAR_LISP ("temp-buffer-show-function", &Vtemp_buffer_show_function,
               doc: /* Non-nil means call as function to display a help buffer.