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

[Thien-Thi Nguyen]

Index: emacs/src/minibuf.c
diff -c emacs/src/minibuf.c:1.239 emacs/src/minibuf.c:1.240
*** emacs/src/minibuf.c:1.239   Mon May 20 04:06:21 2002
--- emacs/src/minibuf.c Sun Jun  2 21:42:52 2002
***************
*** 65,71 ****
  
  Lisp_Object last_minibuf_string;
  
! /* Nonzero means let functions called when within a minibuffer 
     invoke recursive minibuffers (to read arguments, or whatever) */
  
  int enable_recursive_minibuffers;
--- 65,71 ----
  
  Lisp_Object last_minibuf_string;
  
! /* Nonzero means let functions called when within a minibuffer
     invoke recursive minibuffers (to read arguments, or whatever) */
  
  int enable_recursive_minibuffers;
***************
*** 103,109 ****
  Lisp_Object Qminibuffer_exit_hook, Vminibuffer_exit_hook;
  
  /* Function to call to read a buffer name.  */
! Lisp_Object Vread_buffer_function; 
  
  /* Nonzero means completion ignores case.  */
  
--- 103,109 ----
  Lisp_Object Qminibuffer_exit_hook, Vminibuffer_exit_hook;
  
  /* Function to call to read a buffer name.  */
! Lisp_Object Vread_buffer_function;
  
  /* Nonzero means completion ignores case.  */
  
***************
*** 148,154 ****
      {
        struct frame *sf = XFRAME (selected_frame);
        Lisp_Object buffer;
!       
        /* I don't think that any frames may validly have a null minibuffer
         window anymore.  */
        if (NILP (sf->minibuffer_window))
--- 148,154 ----
      {
        struct frame *sf = XFRAME (selected_frame);
        Lisp_Object buffer;
! 
        /* I don't think that any frames may validly have a null minibuffer
         window anymore.  */
        if (NILP (sf->minibuffer_window))
***************
*** 230,242 ****
    struct gcpro gcpro1, gcpro2;
    Lisp_Object expr_and_pos;
    int pos;
!       
    GCPRO2 (val, defalt);
!       
    if (STRINGP (val) && XSTRING (val)->size == 0
        && STRINGP (defalt))
      val = defalt;
!       
    expr_and_pos = Fread_from_string (val, Qnil, Qnil);
    pos = XINT (Fcdr (expr_and_pos));
    if (pos != XSTRING (val)->size)
--- 230,242 ----
    struct gcpro gcpro1, gcpro2;
    Lisp_Object expr_and_pos;
    int pos;
! 
    GCPRO2 (val, defalt);
! 
    if (STRINGP (val) && XSTRING (val)->size == 0
        && STRINGP (defalt))
      val = defalt;
! 
    expr_and_pos = Fread_from_string (val, Qnil, Qnil);
    pos = XINT (Fcdr (expr_and_pos));
    if (pos != XSTRING (val)->size)
***************
*** 252,258 ****
            error ("Trailing garbage following expression");
        }
      }
!       
    val = Fcar (expr_and_pos);
    RETURN_UNGCPRO (val);
  }
--- 252,258 ----
            error ("Trailing garbage following expression");
        }
      }
! 
    val = Fcar (expr_and_pos);
    RETURN_UNGCPRO (val);
  }
***************
*** 298,307 ****
    if (s)
      {
        len = strlen (line);
!       
        if (len > 0 && line[len - 1] == '\n')
        line[--len] = '\0';
!       
        val = build_string (line);
        xfree (line);
      }
--- 298,307 ----
    if (s)
      {
        len = strlen (line);
! 
        if (len > 0 && line[len - 1] == '\n')
        line[--len] = '\0';
! 
        val = build_string (line);
        xfree (line);
      }
***************
*** 310,320 ****
        xfree (line);
        error ("Error reading from stdin");
      }
!   
    /* If Lisp form desired instead of string, parse it. */
    if (expflag)
      val = string_to_object (val, defalt);
!   
    return val;
  }
  
--- 310,320 ----
        xfree (line);
        error ("Error reading from stdin");
      }
! 
    /* If Lisp form desired instead of string, parse it. */
    if (expflag)
      val = string_to_object (val, defalt);
! 
    return val;
  }
  
***************
*** 328,334 ****
    /* This function is written to be most efficient when there's a prompt.  */
    Lisp_Object beg = make_number (BEGV);
    Lisp_Object end = Ffield_end (beg, Qnil, Qnil);
!   
    if (XINT (end) == ZV && NILP (Fget_char_property (beg, Qfield, Qnil)))
      return beg;
    else
--- 328,334 ----
    /* This function is written to be most efficient when there's a prompt.  */
    Lisp_Object beg = make_number (BEGV);
    Lisp_Object end = Ffield_end (beg, Qnil, Qnil);
! 
    if (XINT (end) == ZV && NILP (Fget_char_property (beg, Qfield, Qnil)))
      return beg;
    else
***************
*** 581,589 ****
        Fadd_text_properties (make_number (BEG), make_number (PT),
                            Vminibuffer_prompt_properties, Qnil);
      }
!   
!   minibuf_prompt_width = current_column ();
!       
    /* If appropriate, copy enable-multibyte-characters into the minibuffer.  */
    if (inherit_input_method)
      current_buffer->enable_multibyte_characters = enable_multibyte;
--- 581,589 ----
        Fadd_text_properties (make_number (BEG), make_number (PT),
                            Vminibuffer_prompt_properties, Qnil);
      }
! 
!   minibuf_prompt_width = (int) current_column (); /* iftc */
! 
    /* If appropriate, copy enable-multibyte-characters into the minibuffer.  */
    if (inherit_input_method)
      current_buffer->enable_multibyte_characters = enable_multibyte;
***************
*** 978,984 ****
      default_string = SYMBOL_NAME (default_value);
    else
      default_string = default_value;
!     
    name = Fcompleting_read (prompt, Vobarray, Qcommandp, Qt,
                           Qnil, Qnil, default_string, Qnil);
    if (NILP (name))
--- 978,984 ----
      default_string = SYMBOL_NAME (default_value);
    else
      default_string = default_value;
! 
    name = Fcompleting_read (prompt, Vobarray, Qcommandp, Qt,
                           Qnil, Qnil, default_string, Qnil);
    if (NILP (name))
***************
*** 1013,1019 ****
      default_string = SYMBOL_NAME (default_value);
    else
      default_string = default_value;
!     
    name = Fcompleting_read (prompt, Vobarray,
                           Quser_variable_p, Qt,
                           Qnil, Qnil, default_string, Qnil);
--- 1013,1019 ----
      default_string = SYMBOL_NAME (default_value);
    else
      default_string = default_value;
! 
    name = Fcompleting_read (prompt, Vobarray,
                           Quser_variable_p, Qt,
                           Qnil, Qnil, default_string, Qnil);
***************
*** 1032,1038 ****
       Lisp_Object prompt, def, require_match;
  {
    Lisp_Object args[4];
!   
    if (BUFFERP (def))
      def = XBUFFER (def)->name;
  
--- 1032,1038 ----
       Lisp_Object prompt, def, require_match;
  {
    Lisp_Object args[4];
! 
    if (BUFFERP (def))
      def = XBUFFER (def)->name;
  
***************
*** 1463,1469 ****
    This feature is deprecated--it is best to pass nil for INITIAL-INPUT
    and supply the default value DEF instead.  The user can yank the
    default value into the minibuffer easily using \\[next-history-element].
!   
  HIST, if non-nil, specifies a history list
    and optionally the initial position in the list.
    It can be a symbol, which is the history list variable to use,
--- 1463,1469 ----
    This feature is deprecated--it is best to pass nil for INITIAL-INPUT
    and supply the default value DEF instead.  The user can yank the
    default value into the minibuffer easily using \\[next-history-element].
! 
  HIST, if non-nil, specifies a history list
    and optionally the initial position in the list.
    It can be a symbol, which is the history list variable to use,
***************
*** 1969,1975 ****
      UNGCPRO;
    }
  #endif /* Rewritten code */
!   
    prompt_end_charpos = XINT (Fminibuffer_prompt_end ());
  
    {
--- 1969,1975 ----
      UNGCPRO;
    }
  #endif /* Rewritten code */
! 
    prompt_end_charpos = XINT (Fminibuffer_prompt_end ());
  
    {
***************
*** 2003,2009 ****
          if (STRINGP (tem))
            completion = tem;
        }
!     }      
  
    /* Now find first word-break in the stuff found by completion.
       i gets index in string of where to stop completing.  */
--- 2003,2009 ----
          if (STRINGP (tem))
            completion = tem;
        }
!     }
  
    /* Now find first word-break in the stuff found by completion.
       i gets index in string of where to stop completing.  */
***************
*** 2126,2132 ****
              if (BUFFERP (Vstandard_output))
                {
                  tem = Findent_to (make_number (35), make_number (2));
!                 
                  column = XINT (tem);
                }
              else
--- 2126,2132 ----
              if (BUFFERP (Vstandard_output))
                {
                  tem = Findent_to (make_number (35), make_number (2));
! 
                  column = XINT (tem);
                }
              else