aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Janík2002-01-27 18:20:46 +0000
committerPavel Janík2002-01-27 18:20:46 +0000
commitfd771ceb4d5b09e331d651af1af52fe9aaaa76f3 (patch)
treec67dd8dcba39d4b510c1821b4d291b03a63a437e
parentabf0cb2192c8cd6f3d22ee7360b8a4ba763a09ed (diff)
downloademacs-fd771ceb4d5b09e331d651af1af52fe9aaaa76f3.tar.gz
emacs-fd771ceb4d5b09e331d651af1af52fe9aaaa76f3.zip
(Fread_from_minibuffer, Fread_command, Fread_function)
(Fread_variable, Fread_buffer, minibuffer-completion-confirm): Fix doc-strings.
-rw-r--r--src/minibuf.c21
1 files changed, 11 insertions, 10 deletions
diff --git a/src/minibuf.c b/src/minibuf.c
index a95d8840994..b00662b2000 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -507,7 +507,7 @@ read_minibuf (map, initial, prompt, backup_n, expflag,
507 507
508 if (inherit_input_method) 508 if (inherit_input_method)
509 { 509 {
510 /* `current-input-method' is buffer local. So, remeber it in 510 /* `current-input-method' is buffer local. So, remember it in
511 INPUT_METHOD before changing the current buffer. */ 511 INPUT_METHOD before changing the current buffer. */
512 input_method = Fsymbol_value (Qcurrent_input_method); 512 input_method = Fsymbol_value (Qcurrent_input_method);
513 enable_multibyte = current_buffer->enable_multibyte_characters; 513 enable_multibyte = current_buffer->enable_multibyte_characters;
@@ -608,7 +608,7 @@ read_minibuf (map, initial, prompt, backup_n, expflag,
608 608
609 /* Run our hook, but not if it is empty. 609 /* Run our hook, but not if it is empty.
610 (run-hooks would do nothing if it is empty, 610 (run-hooks would do nothing if it is empty,
611 but it's important to save time here in the usual case). */ 611 but it's important to save time here in the usual case.) */
612 if (!NILP (Vminibuffer_setup_hook) && !EQ (Vminibuffer_setup_hook, Qunbound) 612 if (!NILP (Vminibuffer_setup_hook) && !EQ (Vminibuffer_setup_hook, Qunbound)
613 && !NILP (Vrun_hooks)) 613 && !NILP (Vrun_hooks))
614 call1 (Vrun_hooks, Qminibuffer_setup_hook); 614 call1 (Vrun_hooks, Qminibuffer_setup_hook);
@@ -819,7 +819,7 @@ If optional second arg INITIAL-CONTENTS is non-nil, it is a string
819 is STRING, but point is placed at position POSITION in the minibuffer. 819 is STRING, but point is placed at position POSITION in the minibuffer.
820Third arg KEYMAP is a keymap to use whilst reading; 820Third arg KEYMAP is a keymap to use whilst reading;
821 if omitted or nil, the default is `minibuffer-local-map'. 821 if omitted or nil, the default is `minibuffer-local-map'.
822If fourth arg READ is non-nil, then interpret the result as a lisp object 822If fourth arg READ is non-nil, then interpret the result as a Lisp object
823 and return that object: 823 and return that object:
824 in other words, do `(car (read-from-string INPUT-STRING))' 824 in other words, do `(car (read-from-string INPUT-STRING))'
825Fifth arg HIST, if non-nil, specifies a history list 825Fifth arg HIST, if non-nil, specifies a history list
@@ -969,7 +969,7 @@ the current input method and the setting of `enable-multibyte-characters'. */)
969 969
970DEFUN ("read-command", Fread_command, Sread_command, 1, 2, 0, 970DEFUN ("read-command", Fread_command, Sread_command, 1, 2, 0,
971 doc: /* Read the name of a command and return as a symbol. 971 doc: /* Read the name of a command and return as a symbol.
972Prompts with PROMPT. By default, return DEFAULT-VALUE. */) 972Prompt with PROMPT. By default, return DEFAULT-VALUE. */)
973 (prompt, default_value) 973 (prompt, default_value)
974 Lisp_Object prompt, default_value; 974 Lisp_Object prompt, default_value;
975{ 975{
@@ -992,7 +992,7 @@ Prompts with PROMPT. By default, return DEFAULT-VALUE. */)
992#ifdef NOTDEF 992#ifdef NOTDEF
993DEFUN ("read-function", Fread_function, Sread_function, 1, 1, 0, 993DEFUN ("read-function", Fread_function, Sread_function, 1, 1, 0,
994 doc: /* One arg PROMPT, a string. Read the name of a function and return as a symbol. 994 doc: /* One arg PROMPT, a string. Read the name of a function and return as a symbol.
995Prompts with PROMPT. */) 995Prompt with PROMPT. */)
996 (prompt) 996 (prompt)
997 Lisp_Object prompt; 997 Lisp_Object prompt;
998{ 998{
@@ -1003,7 +1003,7 @@ Prompts with PROMPT. */)
1003 1003
1004DEFUN ("read-variable", Fread_variable, Sread_variable, 1, 2, 0, 1004DEFUN ("read-variable", Fread_variable, Sread_variable, 1, 2, 0,
1005 doc: /* Read the name of a user variable and return it as a symbol. 1005 doc: /* Read the name of a user variable and return it as a symbol.
1006Prompts with PROMPT. By default, return DEFAULT-VALUE. 1006Prompt with PROMPT. By default, return DEFAULT-VALUE.
1007A user variable is one whose documentation starts with a `*' character. */) 1007A user variable is one whose documentation starts with a `*' character. */)
1008 (prompt, default_value) 1008 (prompt, default_value)
1009 Lisp_Object prompt, default_value; 1009 Lisp_Object prompt, default_value;
@@ -1026,10 +1026,11 @@ A user variable is one whose documentation starts with a `*' character. */)
1026} 1026}
1027 1027
1028DEFUN ("read-buffer", Fread_buffer, Sread_buffer, 1, 3, 0, 1028DEFUN ("read-buffer", Fread_buffer, Sread_buffer, 1, 3, 0,
1029 doc: /* One arg PROMPT, a string. Read the name of a buffer and return as a string. 1029 doc: /* Read the name of a buffer and return as a string.
1030Prompts with PROMPT. 1030Prompt with PROMPT.
1031Optional second arg DEF is value to return if user enters an empty line. 1031Optional second arg DEF is value to return if user enters an empty line.
1032If optional third arg REQUIRE-MATCH is non-nil, only existing buffer names are allowed. */) 1032If optional third arg REQUIRE-MATCH is non-nil,
1033 only existing buffer names are allowed. */)
1033 (prompt, def, require_match) 1034 (prompt, def, require_match)
1034 Lisp_Object prompt, def, require_match; 1035 Lisp_Object prompt, def, require_match;
1035{ 1036{
@@ -2406,7 +2407,7 @@ t means to return a list of all possible completions of STRING.
2406 Vminibuffer_completion_predicate = Qnil; 2407 Vminibuffer_completion_predicate = Qnil;
2407 2408
2408 DEFVAR_LISP ("minibuffer-completion-confirm", &Vminibuffer_completion_confirm, 2409 DEFVAR_LISP ("minibuffer-completion-confirm", &Vminibuffer_completion_confirm,
2409 doc: /* Non-nil => demand confirmation of completion before exiting minibuffer. */); 2410 doc: /* Non-nil means to demand confirmation of completion before exiting minibuffer. */);
2410 Vminibuffer_completion_confirm = Qnil; 2411 Vminibuffer_completion_confirm = Qnil;
2411 2412
2412 DEFVAR_LISP ("minibuffer-completing-file-name", 2413 DEFVAR_LISP ("minibuffer-completing-file-name",