diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/minibuf.c | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/src/minibuf.c b/src/minibuf.c index d95249aa5ab..185995e61fb 100644 --- a/src/minibuf.c +++ b/src/minibuf.c | |||
| @@ -314,6 +314,11 @@ read_minibuf_unwind (data) | |||
| 314 | #endif | 314 | #endif |
| 315 | } | 315 | } |
| 316 | 316 | ||
| 317 | |||
| 318 | /* This comment supplies the doc string for read-from-minibuffer, | ||
| 319 | for make-docfile to see. We cannot put this in the real DEFUN | ||
| 320 | due to limits in the Unix cpp. | ||
| 321 | |||
| 317 | DEFUN ("read-from-minibuffer", Fread_from_minibuffer, Sread_from_minibuffer, 1, 5, 0, | 322 | DEFUN ("read-from-minibuffer", Fread_from_minibuffer, Sread_from_minibuffer, 1, 5, 0, |
| 318 | "Read a string from the minibuffer, prompting with string PROMPT.\n\ | 323 | "Read a string from the minibuffer, prompting with string PROMPT.\n\ |
| 319 | If optional second arg INITIAL-CONTENTS is non-nil, it is a string\n\ | 324 | If optional second arg INITIAL-CONTENTS is non-nil, it is a string\n\ |
| @@ -332,7 +337,11 @@ Fifth arg HIST, if non-nil, specifies a history list\n\ | |||
| 332 | In that case, HISTVAR is the history list variable to use,\n\ | 337 | In that case, HISTVAR is the history list variable to use,\n\ |
| 333 | and HISTPOS is the initial position (the position in the list\n\ | 338 | and HISTPOS is the initial position (the position in the list\n\ |
| 334 | which INITIAL-CONTENTS corresponds to).\n\ | 339 | which INITIAL-CONTENTS corresponds to).\n\ |
| 335 | Positions are counted starting from 1 at the beginning of the list.") | 340 | Positions are counted starting from 1 at the beginning of the list." |
| 341 | */ | ||
| 342 | |||
| 343 | DEFUN ("read-from-minibuffer", Fread_from_minibuffer, Sread_from_minibuffer, 1, 5, 0, | ||
| 344 | 0 /* See immediately above */) | ||
| 336 | (prompt, initial_input, keymap, read, hist) | 345 | (prompt, initial_input, keymap, read, hist) |
| 337 | Lisp_Object prompt, initial_input, keymap, read, hist; | 346 | Lisp_Object prompt, initial_input, keymap, read, hist; |
| 338 | { | 347 | { |
| @@ -799,6 +808,10 @@ Lisp_Object Vminibuffer_completion_table, Qminibuffer_completion_table; | |||
| 799 | Lisp_Object Vminibuffer_completion_predicate, Qminibuffer_completion_predicate; | 808 | Lisp_Object Vminibuffer_completion_predicate, Qminibuffer_completion_predicate; |
| 800 | Lisp_Object Vminibuffer_completion_confirm, Qminibuffer_completion_confirm; | 809 | Lisp_Object Vminibuffer_completion_confirm, Qminibuffer_completion_confirm; |
| 801 | 810 | ||
| 811 | /* This comment supplies the doc string for completing-read, | ||
| 812 | for make-docfile to see. We cannot put this in the real DEFUN | ||
| 813 | due to limits in the Unix cpp. | ||
| 814 | |||
| 802 | DEFUN ("completing-read", Fcompleting_read, Scompleting_read, 2, 6, 0, | 815 | DEFUN ("completing-read", Fcompleting_read, Scompleting_read, 2, 6, 0, |
| 803 | "Read a string in the minibuffer, with completion.\n\ | 816 | "Read a string in the minibuffer, with completion.\n\ |
| 804 | Args: PROMPT, TABLE, PREDICATE, REQUIRE-MATCH, INITIAL-INPUT, HIST.\n\ | 817 | Args: PROMPT, TABLE, PREDICATE, REQUIRE-MATCH, INITIAL-INPUT, HIST.\n\ |
| @@ -821,7 +834,10 @@ HIST, if non-nil, specifies a history list\n\ | |||
| 821 | which INITIAL-CONTENTS corresponds to).\n\ | 834 | which INITIAL-CONTENTS corresponds to).\n\ |
| 822 | Positions are counted starting from 1 at the beginning of the list.\n\ | 835 | Positions are counted starting from 1 at the beginning of the list.\n\ |
| 823 | Completion ignores case if the ambient value of\n\ | 836 | Completion ignores case if the ambient value of\n\ |
| 824 | `completion-ignore-case' is non-nil.") | 837 | `completion-ignore-case' is non-nil." |
| 838 | */ | ||
| 839 | DEFUN ("completing-read", Fcompleting_read, Scompleting_read, 2, 6, 0, | ||
| 840 | 0 /* See immediately above */) | ||
| 825 | (prompt, table, pred, require_match, init, hist) | 841 | (prompt, table, pred, require_match, init, hist) |
| 826 | Lisp_Object prompt, table, pred, require_match, init, hist; | 842 | Lisp_Object prompt, table, pred, require_match, init, hist; |
| 827 | { | 843 | { |