[Emacs-diffs] Changes to emacs/lisp/ChangeLog.10 [emacs-unicode-2]

[Miles Bader]

Index: emacs/lisp/ChangeLog.10
diff -c emacs/lisp/ChangeLog.10:1.2.4.2 emacs/lisp/ChangeLog.10:1.2.4.3
*** emacs/lisp/ChangeLog.10:1.2.4.2     Mon Jun 28 07:28:26 2004
--- emacs/lisp/ChangeLog.10     Wed Sep 15 08:59:55 2004
***************
*** 14327,14333 ****
  2002-06-01  Kim F. Storm  <address@hidden>
  
        * simple.el: Reworked previous change.
!       (choose-completion-string1): Merged back into choose-completion-string.
        (choose-completion-string): Run choose-completion-string-functions
        after checking for proper minibuffer window.  Added mini-p arg to
        the hook functions.  Insert choice if all hook functions return nil.
--- 14327,14333 ----
  2002-06-01  Kim F. Storm  <address@hidden>
  
        * simple.el: Reworked previous change.
!       (choose-completion-string1): Merge back into choose-completion-string.
        (choose-completion-string): Run choose-completion-string-functions
        after checking for proper minibuffer window.  Added mini-p arg to
        the hook functions.  Insert choice if all hook functions return nil.
***************
*** 14348,14354 ****
  2002-06-01  Kim F. Storm  <address@hidden>
  
        * simple.el (choose-completion-string-functions): New special hook.
!       (choose-completion-string1): Renamed from choose-completion-string.
        (choose-completion-string): Run choose-completion-string-functions
        until success, and only call choose-completion-string1 if it fails.
  
--- 14348,14354 ----
  2002-06-01  Kim F. Storm  <address@hidden>
  
        * simple.el (choose-completion-string-functions): New special hook.
!       (choose-completion-string1): Rename from choose-completion-string.
        (choose-completion-string): Run choose-completion-string-functions
        until success, and only call choose-completion-string1 if it fails.