Mercurial > emacs
changeset 14818:3349089ced14
(map-y-or-n-p): Fix previous change.
Delete autoload cookie (file is preloaded).
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Sun, 17 Mar 1996 15:40:29 +0000 |
| parents | cdd8a024f000 |
| children | ece1210e739f |
| files | lisp/map-ynp.el |
| diffstat | 1 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/map-ynp.el Sun Mar 17 15:38:50 1996 +0000 +++ b/lisp/map-ynp.el Sun Mar 17 15:40:29 1996 +0000 @@ -34,7 +34,6 @@ ;;; Code: -;;;###autoload (defun map-y-or-n-p (prompter actor list &optional help action-alist no-cursor-in-echo-area) "Ask a series of boolean questions. @@ -79,6 +78,8 @@ Returns the number of actions taken." (let* ((actions 0) user-keys mouse-event map prompt char elt tail def + ;; Non-nil means we should use mouse menus to ask. + use-menus delayed-switch-frame (next (if (or (and list (symbolp list)) (subrp list) @@ -108,6 +109,7 @@ (cons (capitalize (nth 2 elt)) (vector (nth 1 elt)))) action-alist)))) + use-menus t mouse-event last-nonmenu-event)) (setq user-keys (if action-alist (concat (mapconcat (function @@ -134,8 +136,8 @@ (cond ((stringp prompt) ;; Prompt the user about this object. (setq quit-flag nil) - (if mouse-event - (setq def (or (x-popup-dialog mouse-event + (if use-menus + (setq def (or (x-popup-dialog (or mouse-event use-menus) (cons prompt map)) 'quit)) ;; Prompt in the echo area.