1 files changed, 11 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 83df703356b..5b96988b6fc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2000-07-05  Michael Kifer  <kifer@cs.sunysb.edu>
+        
+        * ediff-diff.el (ediff-wordify): use syntax table.
+        * ediff-init.el (ediff-has-face-support-p): use
+        ediff-color-display-p.
+        (ediff-color-display-p): use display-color-p, changed to defun
+        from defsubst.
+        Got rid of special cases for NeXT and OS/2.
+        * ediff-wind.el (ediff-setup-control-frame): set proper modeline
+        face.
+        
 2000-07-05  Stefan Monnier  <monnier@cs.yale.edu>
 
         * emacs-lisp/lucid.el: Require CL.