*** empty log message ***

2 files changed, 16 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4cf47c9e2c6..6e1d5845581 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2005-05-06  Eli Zaretskii  <eliz@gnu.org>
+
+        * loadup.el: Load jka-cmpr-hook instead of jka-comp-hook.
+
+        * jka-compr.el (jka-compr-uninstall): Add autoload cookie.
+
+        * jka-cmpr-hook.el: Renamed from jka-comp-hook.el, to avoid
+        file-name clash with jka-compr.el on 8+3 filesystems.
+
 2005-05-06  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * term/mac-win.el: Don't define or bind scroll bar functions if
@@ -232,10 +241,10 @@
 
         * loadup.el: load jka-comp-hook.
 
-        * jka-compr.el: Many functions and vars moved to jka-compr-hook.el.
+        * jka-compr.el: Many functions and vars moved to jka-comp-hook.el.
         (jka-compr-handler): Add autoload.  `put' calls moved
-        to jka-compr-hook.el.
-        (compression, jka-compr): defgroups moved to jka-compr-hook.el.
+        to jka-comp-hook.el.
+        (compression, jka-compr): defgroups moved to jka-comp-hook.el.
         (jka-compr-inhibit): Autoload.
 
         * jka-comp-hook.el: New file.
diff --git a/src/ChangeLog b/src/ChangeLog
index b44e3e4e626..299e1457655 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-06  Eli Zaretskii  <eliz@gnu.org>
+
+        * Makefile.in (lisp, shortlisp): Add jka-cmpr-hook.elc.
+
 2005-05-06  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * macselect.c (x_own_selection): Accept Lisp string as result of