# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 1115378997 0
# Node ID 0516ae13c256101300354d0621ba9d553267a6b1
# Parent  48e3a972c107d4b20cb30c3feaf6c5e89de3e818
*** empty log message ***

diff -r 48e3a972c107 -r 0516ae13c256 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri May 06 11:28:34 2005 +0000
+++ b/lisp/ChangeLog	Fri May 06 11:29:57 2005 +0000
@@ -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 -r 48e3a972c107 -r 0516ae13c256 src/ChangeLog
--- a/src/ChangeLog	Fri May 06 11:28:34 2005 +0000
+++ b/src/ChangeLog	Fri May 06 11:29:57 2005 +0000
@@ -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