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

[Pavel Janík]

Index: emacs/src/minibuf.c
diff -c emacs/src/minibuf.c:1.231 emacs/src/minibuf.c:1.232
*** emacs/src/minibuf.c:1.231   Tue Dec 18 17:49:19 2001
--- emacs/src/minibuf.c Mon Jan 21 11:15:12 2002
***************
*** 342,348 ****
  
  DEFUN ("minibuffer-contents", Fminibuffer_contents,
         Sminibuffer_contents, 0, 0, 0,
!        doc: /* Return the user input in a minbuffer as a string.
  The current buffer must be a minibuffer.  */)
       ()
  {
--- 342,348 ----
  
  DEFUN ("minibuffer-contents", Fminibuffer_contents,
         Sminibuffer_contents, 0, 0, 0,
!        doc: /* Return the user input in a minibuffer as a string.
  The current buffer must be a minibuffer.  */)
       ()
  {
***************
*** 352,358 ****
  
  DEFUN ("minibuffer-contents-no-properties", 
Fminibuffer_contents_no_properties,
         Sminibuffer_contents_no_properties, 0, 0, 0,
!        doc: /* Return the user input in a minbuffer as a string, without 
text-properties.
  The current buffer must be a minibuffer.  */)
       ()
  {
--- 352,358 ----
  
  DEFUN ("minibuffer-contents-no-properties", 
Fminibuffer_contents_no_properties,
         Sminibuffer_contents_no_properties, 0, 0, 0,
!        doc: /* Return the user input in a minibuffer as a string, without 
text-properties.
  The current buffer must be a minibuffer.  */)
       ()
  {
***************
*** 834,840 ****
   for history commands; but `read-from-minibuffer' does NOT return 
DEFAULT-VALUE
   if the user enters empty input!  It returns the empty string.
  Seventh arg INHERIT-INPUT-METHOD, if non-nil, means the minibuffer inherits
!  the current input method and the setting of enable-multibyte-characters.
  If the variable `minibuffer-allow-text-properties' is non-nil,
   then the string which is returned includes whatever text properties
   were present in the minibuffer.  Otherwise the value has no text properties. 
 */)
--- 834,840 ----
   for history commands; but `read-from-minibuffer' does NOT return 
DEFAULT-VALUE
   if the user enters empty input!  It returns the empty string.
  Seventh arg INHERIT-INPUT-METHOD, if non-nil, means the minibuffer inherits
!  the current input method and the setting of `enable-multibyte-characters'.
  If the variable `minibuffer-allow-text-properties' is non-nil,
   then the string which is returned includes whatever text properties
   were present in the minibuffer.  Otherwise the value has no text properties. 
 */)
***************
*** 936,942 ****
   for history commands, and as the value to return if the user enters
   the empty string.
  Fifth arg INHERIT-INPUT-METHOD, if non-nil, means the minibuffer inherits
!  the current input method and the setting of enable-multibyte-characters.  */)
       (prompt, initial_input, history, default_value, inherit_input_method)
       Lisp_Object prompt, initial_input, history, default_value;
       Lisp_Object inherit_input_method;
--- 936,942 ----
   for history commands, and as the value to return if the user enters
   the empty string.
  Fifth arg INHERIT-INPUT-METHOD, if non-nil, means the minibuffer inherits
!  the current input method and the setting of `enable-multibyte-characters'.  
*/)
       (prompt, initial_input, history, default_value, inherit_input_method)
       Lisp_Object prompt, initial_input, history, default_value;
       Lisp_Object inherit_input_method;
***************
*** 954,960 ****
         doc: /* Read a string from the terminal, not allowing blanks.
  Prompt with PROMPT, and provide INITIAL as an initial value of the input 
string.
  Third arg INHERIT-INPUT-METHOD, if non-nil, means the minibuffer inherits
! the current input method and the setting of enable-multibyte-characters.  */)
       (prompt, initial, inherit_input_method)
       Lisp_Object prompt, initial, inherit_input_method;
  {
--- 954,960 ----
         doc: /* Read a string from the terminal, not allowing blanks.
  Prompt with PROMPT, and provide INITIAL as an initial value of the input 
string.
  Third arg INHERIT-INPUT-METHOD, if non-nil, means the minibuffer inherits
! the current input method and the setting of `enable-multibyte-characters'.  
*/)
       (prompt, initial, inherit_input_method)
       Lisp_Object prompt, initial, inherit_input_method;
  {
***************
*** 1465,1471 ****
  DEF, if non-nil, is the default value.
  
  If INHERIT-INPUT-METHOD is non-nil, the minibuffer inherits
!   the current input method and the setting of enable-multibyte-characters.
  
  Completion ignores case if the ambient value of
    `completion-ignore-case' is non-nil.  */)
--- 1465,1471 ----
  DEF, if non-nil, is the default value.
  
  If INHERIT-INPUT-METHOD is non-nil, the minibuffer inherits
!   the current input method and the setting of `enable-multibyte-characters'.
  
  Completion ignores case if the ambient value of
    `completion-ignore-case' is non-nil.  */)