* frame.c (check_minibuf_window): Initialize 'window' properly,

so that Emacs reliably aborts later if 'window' is not initialized.

diff --git a/src/ChangeLog b/src/ChangeLog
index 37d3419532b7adbce281077edcc2aac1dfbab6d5..324fa156f688b140fdf81433c7d77b4bcafbb1fc 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-26  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * frame.c (check_minibuf_window): Initialize 'window' properly,
+       so that Emacs reliably aborts later if 'window' is not initialized.
+
 2013-08-26  Jan Djärv  <jan.h.d@swipnet.se>
 
        * gtkutil.c (xg_initialize): Set gtk-menu-bar-accel to "" instead

diff --git a/src/frame.c b/src/frame.c
index 4855734c2fc97f8156bfa5cf48d61d3098b00eeb..5ee421bb9bf88259278ba2a3e1aa0467f281ddf2 100644 (file)
--- a/src/frame.c
+++ b/src/frame.c
@@ -1122,7 +1122,7 @@ check_minibuf_window (Lisp_Object frame, int select)
 
   if (WINDOWP (minibuf_window) && EQ (f->minibuffer_window, minibuf_window))
     {
-      Lisp_Object frames, this, window;
+      Lisp_Object frames, this, window = make_number (0);
 
       if (!EQ (frame, selected_frame)
          && FRAME_HAS_MINIBUF_P (XFRAME (selected_frame)))