1 files changed, 12 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cbf2a147f00..cb976d468d2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,15 @@
+2000-05-25  Dave Love  <fx@gnu.org>
+
+        * emacs-lisp/elp.el (elp-restore-function): Don't use obsolete
+        byte-code-function-p.
+
+        * mail/rmailsum.el: Add provide.
+
+        * net/goto-addr.el (goto-address-fontify): Add help-echo property.
+
+        * smerge-mode.el (smerge-diff-switches): Don't use list* in
+        defcustom.
+
 2000-05-25  Michael Kifer  <kifer@cs.sunysb.edu>
         
         * ediff-diff.el (ediff-exec-process): delete --binary option from