From f5adc984fbdc82def6edc297e88c3ee993c674ae Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 26 Aug 2013 10:31:00 -0700 Subject: [PATCH] * frame.c (check_minibuf_window): Initialize 'window' properly, so that Emacs reliably aborts later if 'window' is not initialized. --- src/ChangeLog | 5 +++++ src/frame.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) 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 + + * 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 * 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))) -- 2.11.4.GIT