In temp_output_buffer_show make sure window returned by display_buffer is live (Bug...

* window.c (temp_output_buffer_show): Make sure window returned
by display_buffer is live (Bug#15213).

diff --git a/src/ChangeLog b/src/ChangeLog
index e11587450ec469c6ea3cf028ede1c4bf08c95e7d..b46ba5ba392b8bd5ab421ff206a089b2f4606b74 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-31  Martin Rudalics  <rudalics@gmx.at>
+
+       * window.c (temp_output_buffer_show): Make sure window returned
+       by display_buffer is live (Bug#15213).
+
 2013-08-30  Dmitry Antipov  <dmantipov@yandex.ru>
 
        Minor cleanup to avoid forward declarations.

diff --git a/src/window.c b/src/window.c
index d60ee06077fc4a11d518472e0ce51bcd071e5616..560f31e2c27881a86c88f0ace9fae57fd920e208 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -3341,10 +3341,8 @@ temp_output_buffer_show (register Lisp_Object buf)
 
   if (!NILP (Vtemp_buffer_show_function))
     call1 (Vtemp_buffer_show_function, buf);
-  else
+  else if (WINDOW_LIVE_P (window = display_buffer (buf, Qnil, Qnil)))
     {
-      window = display_buffer (buf, Qnil, Qnil);
-
       if (!EQ (XWINDOW (window)->frame, selected_frame))
        Fmake_frame_visible (WINDOW_FRAME (XWINDOW (window)));
       Vminibuf_scroll_window = window;