summaryrefslogtreecommitdiff
path: root/src/fns.c
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2015-06-23 14:02:24 -0400
committerGlenn Morris <rgm@gnu.org>2015-06-23 14:02:24 -0400
commit2ca5558395c92b25b58478627b426c66f8e4f170 (patch)
tree0a9b790f69e55a65de1cdbabab8c8d15eb22d18a /src/fns.c
parentabe07ef01ccb61968e6aebc1178dbefb683a27ae (diff)
downloademacs-2ca5558395c92b25b58478627b426c66f8e4f170.tar.gz
Check for an input event before showing a dialog box. (Bug#20813)
* lisp/subr.el (y-or-n-p): * src/fns.c (Fyes_or_no_p): Check last-input-event as well as last-nonmenu-event.
Diffstat (limited to 'src/fns.c')
-rw-r--r--src/fns.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/fns.c b/src/fns.c
index 6bbb57ffd7d..cef2823ee76 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -2686,7 +2686,7 @@ if `last-nonmenu-event' is nil, and `use-dialog-box' is non-nil. */)
CHECK_STRING (prompt);
if ((NILP (last_nonmenu_event) || CONSP (last_nonmenu_event))
- && use_dialog_box)
+ && use_dialog_box && ! NILP (last_input_event))
{
Lisp_Object pane, menu, obj;
redisplay_preserve_echo_area (4);