[Emacs-diffs] /srv/bzr/emacs/trunk r105737: * minibuf.c (Fread_from_minibuffer): Doc fix.

[Chong Yidong]

------------------------------------------------------------
revno: 105737
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sun 2011-09-11 18:04:52 -0400
message:
  * minibuf.c (Fread_from_minibuffer): Doc fix.
modified:
  src/ChangeLog
  src/minibuf.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-09-11 17:40:53 +0000
+++ b/src/ChangeLog     2011-09-11 22:04:52 +0000
@@ -1,3 +1,7 @@
+2011-09-11  Chong Yidong  <address@hidden>
+
+       * minibuf.c (Fread_from_minibuffer): Doc fix.
+
 2011-09-11  Eli Zaretskii  <address@hidden>
 
        * xdisp.c (produce_stretch_glyph): Fix a typo made in changes from

=== modified file 'src/minibuf.c'
--- a/src/minibuf.c     2011-08-29 15:43:34 +0000
+++ b/src/minibuf.c     2011-09-11 22:04:52 +0000
@@ -914,12 +914,11 @@
   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,