From: Juri Linkov <juri@jurta.org>
Date: Fri, 2 May 2008 01:03:38 +0000 (+0000)
Subject: (Text from Minibuffer): Document a list of default values for `read-from-minibuffer'.
X-Git-Tag: emacs-pretest-23.0.90~5898
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=63b4387f0db8370c2a269cb44101345dec84434c;p=emacs.git

(Text from Minibuffer): Document a list of default values for `read-from-minibuffer'.
---

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 732ddd6a203..17b3ede464d 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-02  Juri Linkov  <juri@jurta.org>
+
+	* minibuf.texi (Text from Minibuffer): Document a list of
+	default values for `read-from-minibuffer'.
+
 2008-04-24  Juanma Barranquero  <lekktu@gmail.com>
 
 	* nonascii.texi (Translation of Characters): Fix previous change.
diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi
index 7353b57c659..a5076a2b7e4 100644
--- a/doc/lispref/minibuf.texi
+++ b/doc/lispref/minibuf.texi
@@ -133,14 +133,14 @@ through the history commands.  It should be a string, a list of
 strings, or @code{nil}.  The string or strings become the minibuffer's
 ``future history,'' available to the user with @kbd{M-n}.
 
-If @var{read} is non-@code{nil}, then @var{default} is also used as
-the input to @code{read}, if the user enters empty input.  (If
-@var{read} is non-@code{nil} and @var{default} is @code{nil}, empty
-input results in an @code{end-of-file} error.)  However, in the usual
-case (where @var{read} is @code{nil}), @code{read-from-minibuffer}
-ignores @var{default} when the user enters empty input and returns an
-empty string, @code{""}.  In this respect, it differs from all the
-other minibuffer input functions in this chapter.
+If @var{read} is non-@code{nil}, then @var{default} is also used
+as the input to @code{read}, if the user enters empty input.
+If @var{default} is a list of strings, the first string is used as the input.
+If @var{default} is @code{nil}, empty input results in an @code{end-of-file} error.
+However, in the usual case (where @var{read} is @code{nil}),
+@code{read-from-minibuffer} ignores @var{default} when the user enters
+empty input and returns an empty string, @code{""}.  In this respect,
+it differs from all the other minibuffer input functions in this chapter.
 
 If @var{keymap} is non-@code{nil}, that keymap is the local keymap to
 use in the minibuffer.  If @var{keymap} is omitted or @code{nil}, the