diff options
author | Glenn Morris <rgm@gnu.org> | 2015-06-23 14:02:24 -0400 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2015-06-23 14:02:24 -0400 |
commit | 2ca5558395c92b25b58478627b426c66f8e4f170 (patch) | |
tree | 0a9b790f69e55a65de1cdbabab8c8d15eb22d18a /lisp | |
parent | abe07ef01ccb61968e6aebc1178dbefb683a27ae (diff) | |
download | emacs-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 'lisp')
-rw-r--r-- | lisp/subr.el | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/subr.el b/lisp/subr.el index df173102fe2..5d40aaae41c 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -2348,6 +2348,7 @@ is nil and `use-dialog-box' is non-nil." (t (setq temp-prompt (concat "Please answer y or n. " prompt)))))))) ((and (display-popup-menus-p) + last-input-event ; not during startup (listp last-nonmenu-event) use-dialog-box) (setq prompt (funcall padded prompt t) |