[Emacs-diffs] trunk r114078: In temp_output_buffer_show make sure window returned by display_buffer is live (Bug#15213).

[Martin Rudalics]

------------------------------------------------------------
revno: 114078
revision-id: address@hidden
parent: address@hidden
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Sat 2013-08-31 11:22:53 +0200
message:
  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).
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/window.c                   window.c-20091113204419-o5vbwnq5f7feedwu-231

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-08-30 12:17:44 +0000
+++ b/src/ChangeLog     2013-08-31 09:22:53 +0000
@@ -1,3 +1,8 @@
+2013-08-31  Martin Rudalics  <address@hidden>
+
+       * window.c (temp_output_buffer_show): Make sure window returned
+       by display_buffer is live (Bug#15213).
+
 2013-08-30  Dmitry Antipov  <address@hidden>
 
        Minor cleanup to avoid forward declarations.

=== modified file 'src/window.c'
--- a/src/window.c      2013-08-29 16:36:54 +0000
+++ b/src/window.c      2013-08-31 09:22:53 +0000
@@ -3341,10 +3341,8 @@
 
   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;