Include frame.h and window.h.

(Fy_or_n_p): Handle minibuffer_auto_raise here.

diff --git a/src/fns.c b/src/fns.c
index 46a9bbe25bf6e3dea2d25ece4ee2afe62e23c74a..1c7a98cae46e5089ce64ff58778605e5c0509c20 100644 (file)
--- a/src/fns.c
+++ b/src/fns.c
@@ -32,6 +32,8 @@ Boston, MA 02111-1307, USA.  */
 #include "buffer.h"
 #include "keyboard.h"
 #include "intervals.h"
+#include "frame.h"
+#include "window.h"
 
 #ifndef NULL
 #define NULL (void *)0
@@ -39,6 +41,9 @@ Boston, MA 02111-1307, USA.  */
 
 extern Lisp_Object Flookup_key ();
 
+extern int minibuffer_auto_raise;
+extern Lisp_Object minibuf_window;
+
 Lisp_Object Qstring_lessp, Qprovide, Qrequire;
 Lisp_Object Qyes_or_no_p_history;
 Lisp_Object Qcursor_in_echo_area;
@@ -1612,6 +1617,15 @@ Also accepts Space to mean yes, or Delete to mean no.")
       choose_minibuf_frame ();
       message_nolog ("%s(y or n) ", XSTRING (xprompt)->data);
 
+      if (minibuffer_auto_raise)
+       {
+         Lisp_Object mini_frame;
+
+         mini_frame = WINDOW_FRAME (XWINDOW (minibuf_window));
+
+         Fraise_frame (mini_frame);
+       }
+
       obj = read_filtered_event (1, 0, 0);
       cursor_in_echo_area = 0;
       /* If we need to quit, quit with cursor_in_echo_area = 0.  */