(map-y-or-n-p): Reorder the options

and rename some of them to be more self-explanatory.

diff --git a/lisp/emacs-lisp/map-ynp.el b/lisp/emacs-lisp/map-ynp.el
index e4b6f1ddce08c32702013e059aa70d6b431e157c..84c7ae58ced7676c1d818aea6bc0efc095933e7a 100644 (file)
--- a/lisp/emacs-lisp/map-ynp.el
+++ b/lisp/emacs-lisp/map-ynp.el
@@ -103,15 +103,18 @@ Returns the number of actions taken."
        (let ((object (if help (capitalize (nth 0 help))))
              (objects (if help (capitalize (nth 1 help))))
              (action (if help (capitalize (nth 2 help)))))
-         (setq map `(("Yes" . act) ("No" . skip) ("Quit" . exit)
-                     (,(if help (concat action " " object " And Quit")
-                         "Do it and Quit") . act-and-exit)
-                     (,(if help (concat action " All " objects)
-                         "Do All") . automatic)
+         (setq map `(("Yes" . act) ("No" . skip)
                      ,@(mapcar (lambda (elt)
-                                 (cons (capitalize (nth 2 elt))
+                                 (cons (with-syntax-table
+                                           text-mode-syntax-table
+                                         (capitalize (nth 2 elt)))
                                        (vector (nth 1 elt))))
-                               action-alist))
+                               action-alist)
+                     (,(if help (concat action " This But No More")
+                         "Do This But No More") . act-and-exit)
+                     (,(if help (concat action " All " objects)
+                         "Do All") . automatic)
+                     ("No For All" . exit))
                use-menus t
                mouse-event last-nonmenu-event))
       (setq user-keys (if action-alist