diff options
| author | Juri Linkov <juri@linkov.net> | 2019-11-27 01:18:17 +0200 |
|---|---|---|
| committer | Juri Linkov <juri@linkov.net> | 2019-11-27 01:18:17 +0200 |
| commit | b3c0fb21bd910f5d86490154451cc324ce9ad66b (patch) | |
| tree | b1a02c46a12013510ff46d065f8340ff73bcd0e0 /src/fns.c | |
| parent | 6960a7543cef8cadc2cb9c20d3f21983ed71621a (diff) | |
| download | emacs-b3c0fb21bd910f5d86490154451cc324ce9ad66b.tar.gz | |
Allow recursive minibuffers for yes-or-no-p and y-or-n-p (bug#17272 bug#19064)
* lisp/subr.el (y-or-n-p): Let-bind enable-recursive-minibuffers to t.
* src/fns.c (Fyes_or_no_p): Specbind Qenable_recursive_minibuffers to Qt.
Diffstat (limited to 'src/fns.c')
| -rw-r--r-- | src/fns.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/fns.c b/src/fns.c index cbb6879223d..3ae3192b3d5 100644 --- a/src/fns.c +++ b/src/fns.c @@ -2805,15 +2805,18 @@ if `last-nonmenu-event' is nil, and `use-dialog-box' is non-nil. */) AUTO_STRING (yes_or_no, "(yes or no) "); prompt = CALLN (Fconcat, prompt, yes_or_no); + ptrdiff_t count = SPECPDL_INDEX (); + specbind (Qenable_recursive_minibuffers, Qt); + while (1) { ans = Fdowncase (Fread_from_minibuffer (prompt, Qnil, Qnil, Qnil, Qyes_or_no_p_history, Qnil, Qnil)); if (SCHARS (ans) == 3 && !strcmp (SSDATA (ans), "yes")) - return Qt; + return unbind_to (count, Qt); if (SCHARS (ans) == 2 && !strcmp (SSDATA (ans), "no")) - return Qnil; + return unbind_to (count, Qnil); Fding (Qnil); Fdiscard_input (); |