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

[Kim F . Storm]

Index: emacs/src/minibuf.c
diff -c emacs/src/minibuf.c:1.288 emacs/src/minibuf.c:1.289
*** emacs/src/minibuf.c:1.288   Thu Oct 20 13:07:14 2005
--- emacs/src/minibuf.c Thu Oct 20 15:03:32 2005
***************
*** 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'.  
! 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 buffer. 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;
--- 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'.
! 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 buffer. 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;
***************
*** 2544,2550 ****
  
        specbind (intern ("completion-common-substring"), common_substring);
        call1 (Vrun_hooks, intern ("completion-setup-hook"));
!       
        unbind_to (count1, Qnil);
      }
  
--- 2544,2550 ----
  
        specbind (intern ("completion-common-substring"), common_substring);
        call1 (Vrun_hooks, intern ("completion-setup-hook"));
! 
        unbind_to (count1, Qnil);
      }
  
***************
*** 2553,2558 ****
--- 2553,2566 ----
    return Qnil;
  }
  
+ 
+ static Lisp_Object
+ display_completion_list_1 (list)
+      Lisp_Object list;
+ {
+   return Fdisplay_completion_list (list, Qnil);
+ }
+ 
  DEFUN ("minibuffer-completion-help", Fminibuffer_completion_help, 
Sminibuffer_completion_help,
         0, 0, "",
         doc: /* Display a list of possible completions of the current 
minibuffer contents.  */)
***************
*** 2574,2580 ****
      }
    else
      internal_with_output_to_temp_buffer ("*Completions*",
!                                        Fdisplay_completion_list,
                                         Fsort (completions, Qstring_lessp));
    return Qnil;
  }
--- 2582,2588 ----
      }
    else
      internal_with_output_to_temp_buffer ("*Completions*",
!                                        display_completion_list_1,
                                         Fsort (completions, Qstring_lessp));
    return Qnil;
  }