diff lisp/emacs-lisp/map-ynp.el @ 83353:532e0a9335a9

Merged in changes from CVS trunk. Plus added lisp/term tweaks. Patches applied: * lorentey@elte.hu--2004/emacs--cvs-trunk--0--base-0 tag of miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-474 * lorentey@elte.hu--2004/emacs--cvs-trunk--0--patch-1 Add CVS metadata files. * lorentey@elte.hu--2004/emacs--cvs-trunk--0--patch-2 Update from CVS. git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-393
author Karoly Lorentey <lorentey@elte.hu>
date Sun, 04 Sep 2005 03:48:17 +0000
parents 9c1dcec0d1fb
children 067115a6e738 2d92f5c9d6ae
line wrap: on
line diff
--- a/lisp/emacs-lisp/map-ynp.el	Thu Aug 25 12:03:34 2005 +0000
+++ b/lisp/emacs-lisp/map-ynp.el	Sun Sep 04 03:48:17 2005 +0000
@@ -1,6 +1,7 @@
 ;;; map-ynp.el --- general-purpose boolean question-asker
 
-;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 2000 Free Software Foundation, Inc.
+;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 2000, 2002, 2003,
+;;   2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Roland McGrath <roland@gnu.org>
 ;; Maintainer: FSF
@@ -102,15 +103,18 @@
 	(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)
+	  (setq map `(("Yes" . act) ("No" . skip)
+		      ,@(mapcar (lambda (elt)
+				  (cons (with-syntax-table
+					    text-mode-syntax-table
+					  (capitalize (nth 2 elt)))
+					(vector (nth 1 elt))))
+				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)
-		      ,@(mapcar (lambda (elt)
-				  (cons (capitalize (nth 2 elt))
-					(vector (nth 1 elt))))
-				action-alist))
+		      ("No For All" . exit))
 		use-menus t
 		mouse-event last-nonmenu-event))
       (setq user-keys (if action-alist