From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 26 Aug 2013 17:31:00 +0000 (-0700)
Subject: * frame.c (check_minibuf_window): Initialize 'window' properly,
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1686^2~112
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f5adc984fbdc82def6edc297e88c3ee993c674ae;p=emacs.git

* 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 37d3419532b..324fa156f68 100644
--- 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 4855734c2fc..5ee421bb9bf 100644
--- 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)))