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

[Kim F. Storm]

Index: emacs/src/minibuf.c
diff -c emacs/src/minibuf.c:1.234 emacs/src/minibuf.c:1.235
*** emacs/src/minibuf.c:1.234   Thu Jan 31 23:32:56 2002
--- emacs/src/minibuf.c Tue Feb 26 17:52:56 2002
***************
*** 123,133 ****
  
  static Lisp_Object last_exact_completion;
  
- /* Non-nil means it is the window for C-M-v to scroll
-    when the minibuffer is selected.  */
- 
- extern Lisp_Object Vminibuf_scroll_window;
- 
  extern Lisp_Object Voverriding_local_map;
  
  Lisp_Object Quser_variable_p;
--- 123,128 ----
***************
*** 551,556 ****
--- 546,553 ----
      Fredirect_frame_focus (selected_frame, mini_frame);
  
    Vminibuf_scroll_window = selected_window;
+   if (minibuf_level == 1 || !EQ (minibuf_window, selected_window))
+     Vminibuf_selected_window = selected_window;
    Fset_window_buffer (minibuf_window, Fcurrent_buffer ());
    Fselect_window (minibuf_window);
    XSETFASTINT (XWINDOW (minibuf_window)->hscroll, 0);