/[emacs]/emacs/src/minibuf.c
ViewVC logotype

Diff of /emacs/src/minibuf.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.232 by pj, Mon Jan 21 16:15:12 2002 UTC revision 1.233 by pj, Sun Jan 27 18:20:46 2002 UTC
# Line 507  read_minibuf (map, initial, prompt, back Line 507  read_minibuf (map, initial, prompt, back
507    
508    if (inherit_input_method)    if (inherit_input_method)
509      {      {
510        /* `current-input-method' is buffer local.  So, remeber it in        /* `current-input-method' is buffer local.  So, remember it in
511           INPUT_METHOD before changing the current buffer.  */           INPUT_METHOD before changing the current buffer.  */
512        input_method = Fsymbol_value (Qcurrent_input_method);        input_method = Fsymbol_value (Qcurrent_input_method);
513        enable_multibyte = current_buffer->enable_multibyte_characters;        enable_multibyte = current_buffer->enable_multibyte_characters;
# Line 608  read_minibuf (map, initial, prompt, back Line 608  read_minibuf (map, initial, prompt, back
608    
609    /* Run our hook, but not if it is empty.    /* Run our hook, but not if it is empty.
610       (run-hooks would do nothing if it is empty,       (run-hooks would do nothing if it is empty,
611       but it's important to save time here in the usual case).  */       but it's important to save time here in the usual case.)  */
612    if (!NILP (Vminibuffer_setup_hook) && !EQ (Vminibuffer_setup_hook, Qunbound)    if (!NILP (Vminibuffer_setup_hook) && !EQ (Vminibuffer_setup_hook, Qunbound)
613        && !NILP (Vrun_hooks))        && !NILP (Vrun_hooks))
614      call1 (Vrun_hooks, Qminibuffer_setup_hook);      call1 (Vrun_hooks, Qminibuffer_setup_hook);
# Line 819  If optional second arg INITIAL-CONTENTS Line 819  If optional second arg INITIAL-CONTENTS
819    is STRING, but point is placed at position POSITION in the minibuffer.    is STRING, but point is placed at position POSITION in the minibuffer.
820  Third arg KEYMAP is a keymap to use whilst reading;  Third arg KEYMAP is a keymap to use whilst reading;
821    if omitted or nil, the default is `minibuffer-local-map'.    if omitted or nil, the default is `minibuffer-local-map'.
822  If fourth arg READ is non-nil, then interpret the result as a lisp object  If fourth arg READ is non-nil, then interpret the result as a Lisp object
823    and return that object:    and return that object:
824    in other words, do `(car (read-from-string INPUT-STRING))'    in other words, do `(car (read-from-string INPUT-STRING))'
825  Fifth arg HIST, if non-nil, specifies a history list  Fifth arg HIST, if non-nil, specifies a history list
# Line 969  the current input method and the setting Line 969  the current input method and the setting
969    
970  DEFUN ("read-command", Fread_command, Sread_command, 1, 2, 0,  DEFUN ("read-command", Fread_command, Sread_command, 1, 2, 0,
971         doc: /* Read the name of a command and return as a symbol.         doc: /* Read the name of a command and return as a symbol.
972  Prompts with PROMPT.  By default, return DEFAULT-VALUE.  */)  Prompt with PROMPT.  By default, return DEFAULT-VALUE.  */)
973       (prompt, default_value)       (prompt, default_value)
974       Lisp_Object prompt, default_value;       Lisp_Object prompt, default_value;
975  {  {
# Line 992  Prompts with PROMPT.  By default, return Line 992  Prompts with PROMPT.  By default, return
992  #ifdef NOTDEF  #ifdef NOTDEF
993  DEFUN ("read-function", Fread_function, Sread_function, 1, 1, 0,  DEFUN ("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.         doc: /* One arg PROMPT, a string.  Read the name of a function and return as a symbol.
995  Prompts with PROMPT.  */)  Prompt with PROMPT.  */)
996       (prompt)       (prompt)
997       Lisp_Object prompt;       Lisp_Object prompt;
998  {  {
# Line 1003  Prompts with PROMPT.  */) Line 1003  Prompts with PROMPT.  */)
1003    
1004  DEFUN ("read-variable", Fread_variable, Sread_variable, 1, 2, 0,  DEFUN ("read-variable", Fread_variable, Sread_variable, 1, 2, 0,
1005         doc: /* Read the name of a user variable and return it as a symbol.         doc: /* Read the name of a user variable and return it as a symbol.
1006  Prompts with PROMPT.  By default, return DEFAULT-VALUE.  Prompt with PROMPT.  By default, return DEFAULT-VALUE.
1007  A user variable is one whose documentation starts with a `*' character.  */)  A user variable is one whose documentation starts with a `*' character.  */)
1008       (prompt, default_value)       (prompt, default_value)
1009       Lisp_Object prompt, default_value;       Lisp_Object prompt, default_value;
# Line 1026  A user variable is one whose documentati Line 1026  A user variable is one whose documentati
1026  }  }
1027    
1028  DEFUN ("read-buffer", Fread_buffer, Sread_buffer, 1, 3, 0,  DEFUN ("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.         doc: /* Read the name of a buffer and return as a string.
1030  Prompts with PROMPT.  Prompt with PROMPT.
1031  Optional second arg DEF is value to return if user enters an empty line.  Optional second arg DEF is value to return if user enters an empty line.
1032  If optional third arg REQUIRE-MATCH is non-nil, only existing buffer names are allowed.  */)  If optional third arg REQUIRE-MATCH is non-nil,
1033     only existing buffer names are allowed.  */)
1034       (prompt, def, require_match)       (prompt, def, require_match)
1035       Lisp_Object prompt, def, require_match;       Lisp_Object prompt, def, require_match;
1036  {  {
# Line 2406  t means to return a list of all possible Line 2407  t means to return a list of all possible
2407    Vminibuffer_completion_predicate = Qnil;    Vminibuffer_completion_predicate = Qnil;
2408    
2409    DEFVAR_LISP ("minibuffer-completion-confirm", &Vminibuffer_completion_confirm,    DEFVAR_LISP ("minibuffer-completion-confirm", &Vminibuffer_completion_confirm,
2410                 doc: /* Non-nil => demand confirmation of completion before exiting minibuffer.  */);                 doc: /* Non-nil means to demand confirmation of completion before exiting minibuffer.  */);
2411    Vminibuffer_completion_confirm = Qnil;    Vminibuffer_completion_confirm = Qnil;
2412    
2413    DEFVAR_LISP ("minibuffer-completing-file-name",    DEFVAR_LISP ("minibuffer-completing-file-name",

Legend:
Removed from v.1.232  
changed lines
  Added in v.1.233

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26