aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMartin Rudalics2013-09-02 14:22:21 +0200
committerMartin Rudalics2013-09-02 14:22:21 +0200
commit8b09823660104a1698c2c8ab902042d2d39b0ebf (patch)
treef21198e16d2a487dc0ef1bbc9952fb16fa878d75 /src
parentfc85e20be1f86f396f08b24ae8e82eb68f5306bd (diff)
downloademacs-8b09823660104a1698c2c8ab902042d2d39b0ebf.tar.gz
emacs-8b09823660104a1698c2c8ab902042d2d39b0ebf.zip
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).
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/frame.c5
2 files changed, 7 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 74482f8c84d..1af0a8193cf 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12013-09-02 Martin Rudalics <rudalics@gmx.at>
2
3 * frame.c (check_minibuf_window): Don't abort if no window was
4 found (Bug#15247).
5
12013-09-02 Dmitry Antipov <dmantipov@yandex.ru> 62013-09-02 Dmitry Antipov <dmantipov@yandex.ru>
2 7
3 Use XGetMotionEvents to ask the last mouse motion time from X server. 8 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)
1137 } 1137 }
1138 } 1138 }
1139 1139
1140 if (!WINDOWP (window)) 1140 /* Don't abort if no window was found (Bug#15247). */
1141 emacs_abort (); 1141 if (WINDOWP (window))
1142 else
1143 { 1142 {
1144 /* Use set_window_buffer instead of Fset_window_buffer (see 1143 /* Use set_window_buffer instead of Fset_window_buffer (see
1145 discussion of bug#11984, bug#12025, bug#12026). */ 1144 discussion of bug#11984, bug#12025, bug#12026). */