diff options
author | Miles Bader <miles@gnu.org> | 2005-04-14 05:03:52 +0000 |
---|---|---|
committer | Miles Bader <miles@gnu.org> | 2005-04-14 05:03:52 +0000 |
commit | 4a4ae7ad21e9e53ed9a0006c39d69108333bc896 (patch) | |
tree | 514ec70cdfdd49c518599e15b8fdf1e85850e7d7 /lisp/emacs-lisp/map-ynp.el | |
parent | 6f14f88410854410caf4b402cfbe0f93a80c3f86 (diff) | |
parent | 24531f226fb1150c3a52a3ebf9273d1af36062ea (diff) | |
download | emacs-4a4ae7ad21e9e53ed9a0006c39d69108333bc896.tar.gz emacs-4a4ae7ad21e9e53ed9a0006c39d69108333bc896.tar.bz2 emacs-4a4ae7ad21e9e53ed9a0006c39d69108333bc896.zip |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-37
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 241-257)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 59-65)
- Update from CVS
- Merge from emacs--cvs-trunk--0
- (mm-string-to-multibyte): Use Gnus trunk definition.
Diffstat (limited to 'lisp/emacs-lisp/map-ynp.el')
-rw-r--r-- | lisp/emacs-lisp/map-ynp.el | 6 |
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) |