diff options
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/minibuf.c | 11 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 6f59c9469e5..456c6aa0c3b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2011-09-11 Chong Yidong <cyd@stupidchicken.com> + + * minibuf.c (Fread_from_minibuffer): Doc fix. + 2011-09-11 Eli Zaretskii <eliz@gnu.org> * xdisp.c (produce_stretch_glyph): Fix a typo made in changes from 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, |