1 files changed, 13 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c9c4d26844b..df9f3993878 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
+2005-06-03  Michael Kifer  <kifer@cs.stonybrook.edu>
+        
+        * ediff-diff.el (ediff-same-contents) Eliminate CL-type functions.
+        
+        * ediff-mult.el (ediff-intersect-directories) Make sure that ".." and
+        "." files are deleted from all file lists before comparison
+        
+        * viper-keym.el
+        (viper-toggle-key,viper-quoted-insert-key,viper-ESC-key):
+        Made them customizable.
+        
+        * viper.el (viper-non-hook-settings): fixed the names of defadvices.
+        
 2005-06-01  Luc Teirlinck  <teirllm@auburn.edu>
 
         * autorevert.el (auto-revert-buffers): Use save-match-data.