aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorChong Yidong2011-01-08 16:17:58 -0500
committerChong Yidong2011-01-08 16:17:58 -0500
commit3d91e302868dfb6bf12e697f81167447ce4a7250 (patch)
tree890b932020a3984ae076361f026a2695db03fa7a /lisp
parent278f68456b8c25fff6d2274476cdc8ee3609f68b (diff)
downloademacs-3d91e302868dfb6bf12e697f81167447ce4a7250.tar.gz
emacs-3d91e302868dfb6bf12e697f81167447ce4a7250.zip
Doc fix for y-or-n-p and yes-or-no-p.
* subr.el (y-or-n-p): Doc fix. * fns.c (Fyes_or_no_p): Doc fix.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/subr.el7
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 86f9e8fa0b9..2df31ccbe7e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12011-01-08 Chong Yidong <cyd@stupidchicken.com> 12011-01-08 Chong Yidong <cyd@stupidchicken.com>
2 2
3 * subr.el (y-or-n-p): Doc fix.
4
3 * custom.el (custom-safe-theme-files): New defcustom. 5 * custom.el (custom-safe-theme-files): New defcustom.
4 (custom-theme-load-confirm): New function. 6 (custom-theme-load-confirm): New function.
5 (load-theme): Load theme using `load', confirming with 7 (load-theme): Load theme using `load', confirming with
diff --git a/lisp/subr.el b/lisp/subr.el
index 0f65fb7fbb0..8294ab17782 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2043,8 +2043,11 @@ floating point support."
2043 2043
2044(defun y-or-n-p (prompt &rest args) 2044(defun y-or-n-p (prompt &rest args)
2045 "Ask user a \"y or n\" question. Return t if answer is \"y\". 2045 "Ask user a \"y or n\" question. Return t if answer is \"y\".
2046The argument PROMPT is the string to display to ask the question. 2046The string to display to ask the question is obtained by
2047It should end in a space; `y-or-n-p' adds `(y or n) ' to it. 2047formatting the string PROMPT with arguments ARGS (see `format').
2048The result should end in a space; `y-or-n-p' adds \"(y or n) \"
2049to it.
2050
2048No confirmation of the answer is requested; a single character is enough. 2051No confirmation of the answer is requested; a single character is enough.
2049Also accepts Space to mean yes, or Delete to mean no. \(Actually, it uses 2052Also accepts Space to mean yes, or Delete to mean no. \(Actually, it uses
2050the bindings in `query-replace-map'; see the documentation of that variable 2053the bindings in `query-replace-map'; see the documentation of that variable