From: Martin Rudalics <rudalics@gmx.at>
Date: Sat, 31 Aug 2013 09:22:53 +0000 (+0200)
Subject: In temp_output_buffer_show make sure window returned by display_buffer is live (Bug... 
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1686^2~45
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0a357e98dc7fec92b5d3a69b044497dba452701c;p=emacs.git

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

* 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 e11587450ec..b46ba5ba392 100644
--- 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 d60ee06077f..560f31e2c27 100644
--- 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;