summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/map-ynp.el
diff options
context:
space:
mode:
authorKaroly Lorentey <lorentey@elte.hu>2005-04-11 12:40:15 +0000
committerKaroly Lorentey <lorentey@elte.hu>2005-04-11 12:40:15 +0000
commit221d5c8772dc29f854292ec7cb423fce925daecf (patch)
tree5fe05145ce31ffcc9d1a621c027410151e4a2106 /lisp/emacs-lisp/map-ynp.el
parent1b9ab2508610fea57aa777956de14ee84d66862f (diff)
parent9552bee8c6e7c5ee16ca60cddebaebdf5d238e05 (diff)
downloademacs-221d5c8772dc29f854292ec7cb423fce925daecf.tar.gz
emacs-221d5c8772dc29f854292ec7cb423fce925daecf.tar.bz2
emacs-221d5c8772dc29f854292ec7cb423fce925daecf.zip
Merged from miles@gnu.org--gnu-2005 (patch 59, 240-245)
Patches applied: * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-240 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-241 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-242 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-243 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-244 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-245 Update from CVS * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-59 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-326
Diffstat (limited to 'lisp/emacs-lisp/map-ynp.el')
-rw-r--r--lisp/emacs-lisp/map-ynp.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/map-ynp.el b/lisp/emacs-lisp/map-ynp.el
index 1f493e746fe..2eb53a86038 100644
--- a/lisp/emacs-lisp/map-ynp.el
+++ b/lisp/emacs-lisp/map-ynp.el
@@ -200,10 +200,10 @@ Returns the number of actions taken."
(concat
(format "Type SPC or `y' to %s the current %s;
DEL or `n' to skip the current %s;
-RET or `q' to exit (skip all remaining %s);
-C-g to quit (cancel the operation);
+RET or `q' to give up on the %s (skip all remaining %s);
+C-g to quit (cancel the whole command);
! to %s all remaining %s;\n"
- action object object objects action
+ action object object action objects action
objects)
(mapconcat (function
(lambda (elt)