From: Martin Rudalics Date: Mon, 2 Sep 2013 12:22:21 +0000 (+0200) Subject: In check_minibuf_window don't abort if no window was found (Bug#15247). X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1686^2~17 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8b09823660104a1698c2c8ab902042d2d39b0ebf;p=emacs.git In check_minibuf_window don't abort if no window was found (Bug#15247). * frame.c (check_minibuf_window): Don't abort if no window was found (Bug#15247). --- diff --git a/src/ChangeLog b/src/ChangeLog index 74482f8c84d..1af0a8193cf 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2013-09-02 Martin Rudalics + + * frame.c (check_minibuf_window): Don't abort if no window was + found (Bug#15247). + 2013-09-02 Dmitry Antipov Use XGetMotionEvents to ask the last mouse motion time from X server. diff --git a/src/frame.c b/src/frame.c index 5ee421bb9bf..e33426c2a44 100644 --- a/src/frame.c +++ b/src/frame.c @@ -1137,9 +1137,8 @@ check_minibuf_window (Lisp_Object frame, int select) } } - if (!WINDOWP (window)) - emacs_abort (); - else + /* Don't abort if no window was found (Bug#15247). */ + if (WINDOWP (window)) { /* Use set_window_buffer instead of Fset_window_buffer (see discussion of bug#11984, bug#12025, bug#12026). */