*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4cf47c9e2c63dc48d420259721dcefa2179da65e..6e1d5845581ec52e4d41ae66108c47789efff5d8 100644 (file)
--- 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 b44e3e4e626b9c7bab607b308df19487722b0a77..299e1457655e50d2e4f5492b350a3a145ffb4153 100644 (file)
--- 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