summaryrefslogtreecommitdiff
path: root/src/minibuf.c
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2011-09-11 18:04:52 -0400
committerChong Yidong <cyd@stupidchicken.com>2011-09-11 18:04:52 -0400
commit20f53c697985dffdec6a29a2f8b0aa6fa5ee820a (patch)
tree86e28b8995789734a6e1201f0f0cccd887b2a125 /src/minibuf.c
parent4a592f669818b70d41996b87e2185735f3d6074b (diff)
downloademacs-20f53c697985dffdec6a29a2f8b0aa6fa5ee820a.tar.gz
* minibuf.c (Fread_from_minibuffer): Doc fix.
Diffstat (limited to 'src/minibuf.c')
-rw-r--r--src/minibuf.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/minibuf.c b/src/minibuf.c
index ad8f3ed8b86..d3f43b06254 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -914,12 +914,11 @@ Fifth arg HIST, if non-nil, specifies a history list and optionally
history commands. For consistency, you should also specify that
element of the history as the value of INITIAL-CONTENTS. Positions
are counted starting from 1 at the beginning of the list.
-Sixth arg DEFAULT-VALUE is the default value or the list of default values.
- If non-nil, it is available for history commands, and as the value
- (or the first element of the list of default values) to return
- if the user enters the empty string. But, unless READ is non-nil,
- `read-from-minibuffer' does NOT return DEFAULT-VALUE if the user enters
- empty input! It returns the empty string.
+Sixth arg DEFAULT-VALUE is a default value or list of default values.
+ If non-nil, it is available via history commands. If READ is
+ non-nil, it is also the default to `read' if the user enters empty
+ input. If READ is non-nil, `read-from-minibuffer' does NOT return
+ DEFAULT-VALUE for empty input! It returns the empty string.
Seventh arg INHERIT-INPUT-METHOD, if non-nil, means the minibuffer inherits
the current input method and the setting of `enable-multibyte-characters'.
If the variable `minibuffer-allow-text-properties' is non-nil,