diff options
| author | Juri Linkov | 2008-05-02 01:03:38 +0000 |
|---|---|---|
| committer | Juri Linkov | 2008-05-02 01:03:38 +0000 |
| commit | 63b4387f0db8370c2a269cb44101345dec84434c (patch) | |
| tree | 5436fb092765368115a3a85d06e99f1a1b9d07ad | |
| parent | 2e3148e27795fa1de2439ebdff41f46a6b35809b (diff) | |
| download | emacs-63b4387f0db8370c2a269cb44101345dec84434c.tar.gz emacs-63b4387f0db8370c2a269cb44101345dec84434c.zip | |
(Text from Minibuffer): Document a list of default values for `read-from-minibuffer'.
| -rw-r--r-- | doc/lispref/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/lispref/minibuf.texi | 16 |
2 files changed, 13 insertions, 8 deletions
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 @@ | |||
| 1 | 2008-05-02 Juri Linkov <juri@jurta.org> | ||
| 2 | |||
| 3 | * minibuf.texi (Text from Minibuffer): Document a list of | ||
| 4 | default values for `read-from-minibuffer'. | ||
| 5 | |||
| 1 | 2008-04-24 Juanma Barranquero <lekktu@gmail.com> | 6 | 2008-04-24 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 7 | ||
| 3 | * nonascii.texi (Translation of Characters): Fix previous change. | 8 | * 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 | |||
| 133 | strings, or @code{nil}. The string or strings become the minibuffer's | 133 | strings, or @code{nil}. The string or strings become the minibuffer's |
| 134 | ``future history,'' available to the user with @kbd{M-n}. | 134 | ``future history,'' available to the user with @kbd{M-n}. |
| 135 | 135 | ||
| 136 | If @var{read} is non-@code{nil}, then @var{default} is also used as | 136 | If @var{read} is non-@code{nil}, then @var{default} is also used |
| 137 | the input to @code{read}, if the user enters empty input. (If | 137 | as the input to @code{read}, if the user enters empty input. |
| 138 | @var{read} is non-@code{nil} and @var{default} is @code{nil}, empty | 138 | If @var{default} is a list of strings, the first string is used as the input. |
| 139 | input results in an @code{end-of-file} error.) However, in the usual | 139 | If @var{default} is @code{nil}, empty input results in an @code{end-of-file} error. |
| 140 | case (where @var{read} is @code{nil}), @code{read-from-minibuffer} | 140 | However, in the usual case (where @var{read} is @code{nil}), |
| 141 | ignores @var{default} when the user enters empty input and returns an | 141 | @code{read-from-minibuffer} ignores @var{default} when the user enters |
| 142 | empty string, @code{""}. In this respect, it differs from all the | 142 | empty input and returns an empty string, @code{""}. In this respect, |
| 143 | other minibuffer input functions in this chapter. | 143 | it differs from all the other minibuffer input functions in this chapter. |
| 144 | 144 | ||
| 145 | If @var{keymap} is non-@code{nil}, that keymap is the local keymap to | 145 | If @var{keymap} is non-@code{nil}, that keymap is the local keymap to |
| 146 | use in the minibuffer. If @var{keymap} is omitted or @code{nil}, the | 146 | use in the minibuffer. If @var{keymap} is omitted or @code{nil}, the |