diff options
| author | Lars Ingebrigtsen | 2014-02-07 20:23:25 -0800 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2014-02-07 20:23:25 -0800 |
| commit | aa60235ad4820ed32259552769b4ec3f60cda97e (patch) | |
| tree | 94b17e6bb7ceffa56c6e2379010ef63b062b994c /src | |
| parent | c96411bdad902ef3916e235c574df65d03a19d1a (diff) | |
| download | emacs-aa60235ad4820ed32259552769b4ec3f60cda97e.tar.gz emacs-aa60235ad4820ed32259552769b4ec3f60cda97e.zip | |
* minibuf.c (Fread_string): Doc clarification.
Fixes: debbugs:15422
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/minibuf.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 133da94bb97..25cc486e1bc 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2014-02-08 Lars Ingebrigtsen <larsi@gnus.org> | 1 | 2014-02-08 Lars Ingebrigtsen <larsi@gnus.org> |
| 2 | 2 | ||
| 3 | * minibuf.c (Fread_string): Doc clarification (bug#15422). | ||
| 4 | |||
| 3 | * buffer.c (Fmake_overlay): Doc clarification (bug#15489). | 5 | * buffer.c (Fmake_overlay): Doc clarification (bug#15489). |
| 4 | 6 | ||
| 5 | 2014-02-08 Juanma Barranquero <lekktu@gmail.com> | 7 | 2014-02-08 Juanma Barranquero <lekktu@gmail.com> |
diff --git a/src/minibuf.c b/src/minibuf.c index 13503beb630..f325381d1ca 100644 --- a/src/minibuf.c +++ b/src/minibuf.c | |||
| @@ -965,9 +965,9 @@ and some related functions, which use zero-indexing for POSITION. */) | |||
| 965 | DEFUN ("read-string", Fread_string, Sread_string, 1, 5, 0, | 965 | DEFUN ("read-string", Fread_string, Sread_string, 1, 5, 0, |
| 966 | doc: /* Read a string from the minibuffer, prompting with string PROMPT. | 966 | doc: /* Read a string from the minibuffer, prompting with string PROMPT. |
| 967 | If non-nil, second arg INITIAL-INPUT is a string to insert before reading. | 967 | If non-nil, second arg INITIAL-INPUT is a string to insert before reading. |
| 968 | This argument has been superseded by DEFAULT-VALUE and should normally | 968 | This argument has been superseded by DEFAULT-VALUE and should normally be nil |
| 969 | be nil in new code. It behaves as in `read-from-minibuffer'. See the | 969 | in new code. It behaves as INITIAL-CONTENTS in `read-from-minibuffer' (which |
| 970 | documentation string of that function for details. | 970 | see). |
| 971 | The third arg HISTORY, if non-nil, specifies a history list | 971 | The third arg HISTORY, if non-nil, specifies a history list |
| 972 | and optionally the initial position in the list. | 972 | and optionally the initial position in the list. |
| 973 | See `read-from-minibuffer' for details of HISTORY argument. | 973 | See `read-from-minibuffer' for details of HISTORY argument. |