diff options
| author | Martin Rudalics <rudalics@gmx.at> | 2013-08-31 11:22:53 +0200 |
|---|---|---|
| committer | Martin Rudalics <rudalics@gmx.at> | 2013-08-31 11:22:53 +0200 |
| commit | 0a357e98dc7fec92b5d3a69b044497dba452701c (patch) | |
| tree | 80e316bc6e287ac2fbc21888a6b8a43e6c962907 | |
| parent | 415f808eb158e4988bc91092cd96e43c74d2873e (diff) | |
| download | emacs-0a357e98dc7fec92b5d3a69b044497dba452701c.tar.gz emacs-0a357e98dc7fec92b5d3a69b044497dba452701c.tar.bz2 emacs-0a357e98dc7fec92b5d3a69b044497dba452701c.zip | |
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).
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/window.c | 4 |
2 files changed, 6 insertions, 3 deletions
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; |