Comment change.

[gnu-emacs] / lisp / map-ynp.el

diff --git a/lisp/map-ynp.el b/lisp/map-ynp.el
index 5ca5a7ee966dc8b90b70f992fac96f98a66fcea6..bfe2ee7af4c39a903aa5e739967b4d8a6d0ed05c 100644 (file)
--- 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.
@@ -144,6 +146,8 @@ Returns the number of actions taken."
                       (message "%s(y, n, !, ., q, %sor %s) "
                                prompt user-keys
                                (key-description (vector help-char)))
+                      (if minibuffer-auto-raise
+                          (raise-frame (window-frame (minibuffer-window))))
                       (setq char (read-event))
                       ;; Show the answer to the question.
                       (message "%s(y, n, !, ., q, %sor %s) %s"