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

[Masatake YAMATO]

Index: emacs/src/minibuf.c
diff -c emacs/src/minibuf.c:1.286 emacs/src/minibuf.c:1.287
*** emacs/src/minibuf.c:1.286   Fri Sep 30 18:30:10 2005
--- emacs/src/minibuf.c Sun Oct 16 09:31:37 2005
***************
*** 2351,2357 ****
  }
  
  DEFUN ("display-completion-list", Fdisplay_completion_list, 
Sdisplay_completion_list,
!        1, 1, 0,
         doc: /* Display the list of completions, COMPLETIONS, using 
`standard-output'.
  Each element may be just a symbol or string
  or may be a list of two strings to be printed as if concatenated.
--- 2351,2357 ----
  }
  
  DEFUN ("display-completion-list", Fdisplay_completion_list, 
Sdisplay_completion_list,
!        1, 2, 0,
         doc: /* Display the list of completions, COMPLETIONS, using 
`standard-output'.
  Each element may be just a symbol or string
  or may be a list of two strings to be printed as if concatenated.
***************
*** 2361,2374 ****
  The actual completion alternatives, as inserted, are given `mouse-face'
  properties of `highlight'.
  At the end, this runs the normal hook `completion-setup-hook'.
! It can find the completion buffer in `standard-output'.  */)
!      (completions)
       Lisp_Object completions;
  {
    Lisp_Object tail, elt;
    register int i;
    int column = 0;
!   struct gcpro gcpro1, gcpro2;
    struct buffer *old = current_buffer;
    int first = 1;
  
--- 2361,2383 ----
  The actual completion alternatives, as inserted, are given `mouse-face'
  properties of `highlight'.
  At the end, this runs the normal hook `completion-setup-hook'.
! It can find the completion buffer in `standard-output'.  
! The optional second arg COMMON-SUBSTRING is a string. 
! It is used to put faces, `completions-first-difference` and
! `completions-common-part' on the completion bufffer. The
! `completions-common-part' face is put on the common substring
! specified by COMMON-SUBSTRING. If COMMON-SUBSTRING is nil,
! the faces are not put. 
! Internally, COMMON-SUBSTRING is bound to `completion-common-substring' 
! during running `completion-setup-hook'. */)
!      (completions, common_substring)
       Lisp_Object completions;
+      Lisp_Object common_substring;
  {
    Lisp_Object tail, elt;
    register int i;
    int column = 0;
!   struct gcpro gcpro1, gcpro2, gcpro3;
    struct buffer *old = current_buffer;
    int first = 1;
  
***************
*** 2377,2383 ****
       except for ELT.  ELT can be pointing to a string
       when terpri or Findent_to calls a change hook.  */
    elt = Qnil;
!   GCPRO2 (completions, elt);
  
    if (BUFFERP (Vstandard_output))
      set_buffer_internal (XBUFFER (Vstandard_output));
--- 2386,2392 ----
       except for ELT.  ELT can be pointing to a string
       when terpri or Findent_to calls a change hook.  */
    elt = Qnil;
!   GCPRO3 (completions, elt, common_substring);
  
    if (BUFFERP (Vstandard_output))
      set_buffer_internal (XBUFFER (Vstandard_output));
***************
*** 2526,2538 ****
        }
      }
  
-   UNGCPRO;
- 
    if (BUFFERP (Vstandard_output))
      set_buffer_internal (old);
  
    if (!NILP (Vrun_hooks))
!     call1 (Vrun_hooks, intern ("completion-setup-hook"));
  
    return Qnil;
  }
--- 2535,2554 ----
        }
      }
  
    if (BUFFERP (Vstandard_output))
      set_buffer_internal (old);
  
    if (!NILP (Vrun_hooks))
!     {
!       int count1 = SPECPDL_INDEX ();
! 
!       specbind (intern ("completion-common-substring"), common_substring);
!       call1 (Vrun_hooks, intern ("completion-setup-hook"));
!       
!       unbind_to (count1, Qnil);
!     }
! 
!   UNGCPRO;
  
    return Qnil;
  }