[Emacs-diffs] Changes to emacs/src/window.c

[Kim F. Storm]

Index: emacs/src/window.c
diff -c emacs/src/window.c:1.403 emacs/src/window.c:1.404
*** emacs/src/window.c:1.403    Tue Feb 26 17:50:55 2002
--- emacs/src/window.c  Thu Feb 28 17:07:45 2002
***************
*** 123,129 ****
  /* 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;
  
  /* Non-nil means it is the window for C-M-v to scroll
     when the mini-buffer is selected.  */
--- 123,129 ----
  /* Non-nil means it is the window whose mode line should be
     shown as the selected window when the minibuffer is selected.  */
  
! 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,5168 ****
    window_min_width = XINT (data->min_width);
  
    Vminibuf_scroll_window = data->minibuf_scroll_window;
!   Vminibuf_selected_window = data->minibuf_selected_window;
  
    return (FRAME_LIVE_P (f) ? Qt : Qnil);
  }
--- 5162,5168 ----
    window_min_width = XINT (data->min_width);
  
    Vminibuf_scroll_window = data->minibuf_scroll_window;
!   minibuf_selected_window = data->minibuf_selected_window;
  
    return (FRAME_LIVE_P (f) ? Qt : Qnil);
  }
***************
*** 5373,5379 ****
    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->root_window = FRAME_ROOT_WINDOW (f);
    data->focus_frame = FRAME_FOCUS_FRAME (f);
    XSETINT (data->min_height, window_min_height);
--- 5373,5379 ----
    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 ? 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,5792 ****
--- 5787,5793 ----
    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.