diff options
| author | Richard M. Stallman <rms@gnu.org> | 1996-03-17 15:40:29 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1996-03-17 15:40:29 +0000 |
| commit | 9ac48f8dbc6c329176b38e00b4f961027d317262 (patch) | |
| tree | b20eb38f86594f63a49811e169e60a9291c256e0 | |
| parent | 5a6e44d1c13fec35b8d55ccccb68ba7355fb71ec (diff) | |
| download | emacs-9ac48f8dbc6c329176b38e00b4f961027d317262.tar.gz | |
(map-y-or-n-p): Fix previous change.
Delete autoload cookie (file is preloaded).
| -rw-r--r-- | lisp/map-ynp.el | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lisp/map-ynp.el b/lisp/map-ynp.el index 5ca5a7ee966..f45fe78e3c3 100644 --- a/lisp/map-ynp.el +++ b/lisp/map-ynp.el @@ -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 @@ are meaningful here. 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 @@ Returns the number of actions taken." (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 @@ Returns the number of actions taken." (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. |