diff options
| author | Pavel Janík | 2002-01-21 16:15:44 +0000 |
|---|---|---|
| committer | Pavel Janík | 2002-01-21 16:15:44 +0000 |
| commit | 029a305c190167d1b11e434a246196e7782c121a (patch) | |
| tree | b8f22804b7b237e2474b1eef194cf980300f5187 /src | |
| parent | bb40a52472e1a5b439d630a2dddfc1190c5d8e82 (diff) | |
| download | emacs-029a305c190167d1b11e434a246196e7782c121a.tar.gz emacs-029a305c190167d1b11e434a246196e7782c121a.zip | |
(Fminibuffer_contents)
(Fminibuffer_contents_no_properties, Fread_from_minibuffer)
(Fread_string, Fread_no_blanks_input, Fcompleting_read): Doc fixes.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/minibuf.c | 12 |
2 files changed, 12 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index bb4013d1160..3765c9101e1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2002-01-21 Pavel Jan,Bm(Bk <Pavel@Janik.cz> | ||
| 2 | |||
| 3 | * minibuf.c (Fminibuffer_contents) | ||
| 4 | (Fminibuffer_contents_no_properties, Fread_from_minibuffer) | ||
| 5 | (Fread_string, Fread_no_blanks_input, Fcompleting_read): Doc fixes. | ||
| 6 | |||
| 1 | 2002-01-21 Richard M. Stallman <rms@gnu.org> | 7 | 2002-01-21 Richard M. Stallman <rms@gnu.org> |
| 2 | 8 | ||
| 3 | * window.c (check_frame_size): Fix minimum height calculation. | 9 | * window.c (check_frame_size): Fix minimum height calculation. |
diff --git a/src/minibuf.c b/src/minibuf.c index 12545dbc97c..a95d8840994 100644 --- a/src/minibuf.c +++ b/src/minibuf.c | |||
| @@ -342,7 +342,7 @@ Return (point-min) if current buffer is not a mini-buffer. */) | |||
| 342 | 342 | ||
| 343 | DEFUN ("minibuffer-contents", Fminibuffer_contents, | 343 | DEFUN ("minibuffer-contents", Fminibuffer_contents, |
| 344 | Sminibuffer_contents, 0, 0, 0, | 344 | Sminibuffer_contents, 0, 0, 0, |
| 345 | doc: /* Return the user input in a minbuffer as a string. | 345 | doc: /* Return the user input in a minibuffer as a string. |
| 346 | The current buffer must be a minibuffer. */) | 346 | The current buffer must be a minibuffer. */) |
| 347 | () | 347 | () |
| 348 | { | 348 | { |
| @@ -352,7 +352,7 @@ The current buffer must be a minibuffer. */) | |||
| 352 | 352 | ||
| 353 | DEFUN ("minibuffer-contents-no-properties", Fminibuffer_contents_no_properties, | 353 | DEFUN ("minibuffer-contents-no-properties", Fminibuffer_contents_no_properties, |
| 354 | Sminibuffer_contents_no_properties, 0, 0, 0, | 354 | Sminibuffer_contents_no_properties, 0, 0, 0, |
| 355 | doc: /* Return the user input in a minbuffer as a string, without text-properties. | 355 | doc: /* Return the user input in a minibuffer as a string, without text-properties. |
| 356 | The current buffer must be a minibuffer. */) | 356 | The current buffer must be a minibuffer. */) |
| 357 | () | 357 | () |
| 358 | { | 358 | { |
| @@ -834,7 +834,7 @@ Sixth arg DEFAULT-VALUE is the default value. If non-nil, it is available | |||
| 834 | for history commands; but `read-from-minibuffer' does NOT return DEFAULT-VALUE | 834 | for history commands; but `read-from-minibuffer' does NOT return DEFAULT-VALUE |
| 835 | if the user enters empty input! It returns the empty string. | 835 | if the user enters empty input! It returns the empty string. |
| 836 | Seventh arg INHERIT-INPUT-METHOD, if non-nil, means the minibuffer inherits | 836 | Seventh arg INHERIT-INPUT-METHOD, if non-nil, means the minibuffer inherits |
| 837 | the current input method and the setting of enable-multibyte-characters. | 837 | the current input method and the setting of `enable-multibyte-characters'. |
| 838 | If the variable `minibuffer-allow-text-properties' is non-nil, | 838 | If the variable `minibuffer-allow-text-properties' is non-nil, |
| 839 | then the string which is returned includes whatever text properties | 839 | then the string which is returned includes whatever text properties |
| 840 | were present in the minibuffer. Otherwise the value has no text properties. */) | 840 | were present in the minibuffer. Otherwise the value has no text properties. */) |
| @@ -936,7 +936,7 @@ Fourth arg DEFAULT-VALUE is the default value. If non-nil, it is used | |||
| 936 | for history commands, and as the value to return if the user enters | 936 | for history commands, and as the value to return if the user enters |
| 937 | the empty string. | 937 | the empty string. |
| 938 | Fifth arg INHERIT-INPUT-METHOD, if non-nil, means the minibuffer inherits | 938 | Fifth arg INHERIT-INPUT-METHOD, if non-nil, means the minibuffer inherits |
| 939 | the current input method and the setting of enable-multibyte-characters. */) | 939 | the current input method and the setting of `enable-multibyte-characters'. */) |
| 940 | (prompt, initial_input, history, default_value, inherit_input_method) | 940 | (prompt, initial_input, history, default_value, inherit_input_method) |
| 941 | Lisp_Object prompt, initial_input, history, default_value; | 941 | Lisp_Object prompt, initial_input, history, default_value; |
| 942 | Lisp_Object inherit_input_method; | 942 | Lisp_Object inherit_input_method; |
| @@ -954,7 +954,7 @@ DEFUN ("read-no-blanks-input", Fread_no_blanks_input, Sread_no_blanks_input, 1, | |||
| 954 | doc: /* Read a string from the terminal, not allowing blanks. | 954 | doc: /* Read a string from the terminal, not allowing blanks. |
| 955 | Prompt with PROMPT, and provide INITIAL as an initial value of the input string. | 955 | Prompt with PROMPT, and provide INITIAL as an initial value of the input string. |
| 956 | Third arg INHERIT-INPUT-METHOD, if non-nil, means the minibuffer inherits | 956 | Third arg INHERIT-INPUT-METHOD, if non-nil, means the minibuffer inherits |
| 957 | the current input method and the setting of enable-multibyte-characters. */) | 957 | the current input method and the setting of `enable-multibyte-characters'. */) |
| 958 | (prompt, initial, inherit_input_method) | 958 | (prompt, initial, inherit_input_method) |
| 959 | Lisp_Object prompt, initial, inherit_input_method; | 959 | Lisp_Object prompt, initial, inherit_input_method; |
| 960 | { | 960 | { |
| @@ -1465,7 +1465,7 @@ HIST, if non-nil, specifies a history list | |||
| 1465 | DEF, if non-nil, is the default value. | 1465 | DEF, if non-nil, is the default value. |
| 1466 | 1466 | ||
| 1467 | If INHERIT-INPUT-METHOD is non-nil, the minibuffer inherits | 1467 | If INHERIT-INPUT-METHOD is non-nil, the minibuffer inherits |
| 1468 | the current input method and the setting of enable-multibyte-characters. | 1468 | the current input method and the setting of `enable-multibyte-characters'. |
| 1469 | 1469 | ||
| 1470 | Completion ignores case if the ambient value of | 1470 | Completion ignores case if the ambient value of |
| 1471 | `completion-ignore-case' is non-nil. */) | 1471 | `completion-ignore-case' is non-nil. */) |