[Emacs-diffs] Changes to emacs/src/minibuf.c

[Pavel Janík]

Index: emacs/src/minibuf.c
diff -c emacs/src/minibuf.c:1.232 emacs/src/minibuf.c:1.233
*** emacs/src/minibuf.c:1.232   Mon Jan 21 11:15:12 2002
--- emacs/src/minibuf.c Sun Jan 27 13:20:46 2002
***************
*** 507,513 ****
  
    if (inherit_input_method)
      {
!       /* `current-input-method' is buffer local.  So, remeber it in
         INPUT_METHOD before changing the current buffer.  */
        input_method = Fsymbol_value (Qcurrent_input_method);
        enable_multibyte = current_buffer->enable_multibyte_characters;
--- 507,513 ----
  
    if (inherit_input_method)
      {
!       /* `current-input-method' is buffer local.  So, remember it in
         INPUT_METHOD before changing the current buffer.  */
        input_method = Fsymbol_value (Qcurrent_input_method);
        enable_multibyte = current_buffer->enable_multibyte_characters;
***************
*** 608,614 ****
  
    /* Run our hook, but not if it is empty.
       (run-hooks would do nothing if it is empty,
!      but it's important to save time here in the usual case).  */
    if (!NILP (Vminibuffer_setup_hook) && !EQ (Vminibuffer_setup_hook, Qunbound)
        && !NILP (Vrun_hooks))
      call1 (Vrun_hooks, Qminibuffer_setup_hook);
--- 608,614 ----
  
    /* Run our hook, but not if it is empty.
       (run-hooks would do nothing if it is empty,
!      but it's important to save time here in the usual case.)  */
    if (!NILP (Vminibuffer_setup_hook) && !EQ (Vminibuffer_setup_hook, Qunbound)
        && !NILP (Vrun_hooks))
      call1 (Vrun_hooks, Qminibuffer_setup_hook);
***************
*** 819,825 ****
    is STRING, but point is placed at position POSITION in the minibuffer.
  Third arg KEYMAP is a keymap to use whilst reading;
    if omitted or nil, the default is `minibuffer-local-map'.
! If fourth arg READ is non-nil, then interpret the result as a lisp object
    and return that object:
    in other words, do `(car (read-from-string INPUT-STRING))'
  Fifth arg HIST, if non-nil, specifies a history list
--- 819,825 ----
    is STRING, but point is placed at position POSITION in the minibuffer.
  Third arg KEYMAP is a keymap to use whilst reading;
    if omitted or nil, the default is `minibuffer-local-map'.
! If fourth arg READ is non-nil, then interpret the result as a Lisp object
    and return that object:
    in other words, do `(car (read-from-string INPUT-STRING))'
  Fifth arg HIST, if non-nil, specifies a history list
***************
*** 969,975 ****
  
  DEFUN ("read-command", Fread_command, Sread_command, 1, 2, 0,
         doc: /* Read the name of a command and return as a symbol.
! Prompts with PROMPT.  By default, return DEFAULT-VALUE.  */)
       (prompt, default_value)
       Lisp_Object prompt, default_value;
  {
--- 969,975 ----
  
  DEFUN ("read-command", Fread_command, Sread_command, 1, 2, 0,
         doc: /* Read the name of a command and return as a symbol.
! Prompt with PROMPT.  By default, return DEFAULT-VALUE.  */)
       (prompt, default_value)
       Lisp_Object prompt, default_value;
  {
***************
*** 992,998 ****
  #ifdef NOTDEF
  DEFUN ("read-function", Fread_function, Sread_function, 1, 1, 0,
         doc: /* One arg PROMPT, a string.  Read the name of a function and 
return as a symbol.
! Prompts with PROMPT.  */)
       (prompt)
       Lisp_Object prompt;
  {
--- 992,998 ----
  #ifdef NOTDEF
  DEFUN ("read-function", Fread_function, Sread_function, 1, 1, 0,
         doc: /* One arg PROMPT, a string.  Read the name of a function and 
return as a symbol.
! Prompt with PROMPT.  */)
       (prompt)
       Lisp_Object prompt;
  {
***************
*** 1003,1009 ****
  
  DEFUN ("read-variable", Fread_variable, Sread_variable, 1, 2, 0,
         doc: /* Read the name of a user variable and return it as a symbol.
! Prompts with PROMPT.  By default, return DEFAULT-VALUE.
  A user variable is one whose documentation starts with a `*' character.  */)
       (prompt, default_value)
       Lisp_Object prompt, default_value;
--- 1003,1009 ----
  
  DEFUN ("read-variable", Fread_variable, Sread_variable, 1, 2, 0,
         doc: /* Read the name of a user variable and return it as a symbol.
! Prompt with PROMPT.  By default, return DEFAULT-VALUE.
  A user variable is one whose documentation starts with a `*' character.  */)
       (prompt, default_value)
       Lisp_Object prompt, default_value;
***************
*** 1026,1035 ****
  }
  
  DEFUN ("read-buffer", Fread_buffer, Sread_buffer, 1, 3, 0,
!        doc: /* One arg PROMPT, a string.  Read the name of a buffer and 
return as a string.
! Prompts with PROMPT.
  Optional second arg DEF is value to return if user enters an empty line.
! If optional third arg REQUIRE-MATCH is non-nil, only existing buffer names 
are allowed.  */)
       (prompt, def, require_match)
       Lisp_Object prompt, def, require_match;
  {
--- 1026,1036 ----
  }
  
  DEFUN ("read-buffer", Fread_buffer, Sread_buffer, 1, 3, 0,
!        doc: /* Read the name of a buffer and return as a string.
! Prompt with PROMPT.
  Optional second arg DEF is value to return if user enters an empty line.
! If optional third arg REQUIRE-MATCH is non-nil,
!  only existing buffer names are allowed.  */)
       (prompt, def, require_match)
       Lisp_Object prompt, def, require_match;
  {
***************
*** 2406,2412 ****
    Vminibuffer_completion_predicate = Qnil;
  
    DEFVAR_LISP ("minibuffer-completion-confirm", 
&Vminibuffer_completion_confirm,
!              doc: /* Non-nil => demand confirmation of completion before 
exiting minibuffer.  */);
    Vminibuffer_completion_confirm = Qnil;
  
    DEFVAR_LISP ("minibuffer-completing-file-name",
--- 2407,2413 ----
    Vminibuffer_completion_predicate = Qnil;
  
    DEFVAR_LISP ("minibuffer-completion-confirm", 
&Vminibuffer_completion_confirm,
!              doc: /* Non-nil means to demand confirmation of completion 
before exiting minibuffer.  */);
    Vminibuffer_completion_confirm = Qnil;
  
    DEFVAR_LISP ("minibuffer-completing-file-name",