Remove conflict with XEmacs package.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ec43edb..be2b978 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -75,9 +75,10 @@
        buffer.
        * liece-xemacs.el (liece-fix-menu-path-switch-buffer): Removed old
        defadvice to easy-menu-add-item.
- 
+
 2002-06-08  Adrian Aichner  <adrian@xemacs.org>
 
+       * Makefile.lisp: Include XEmacs.rules.
        * liece-commands.el (liece-command-nickname): Use
        truncate-string-to-width instead of non-existent truncate-string.
        * liece.el (liece-open-server): Ditto.
@@ -117,12 +118,18 @@
        * liece-modules.el: Don't compile liece-q-ccl.el.
        * liece-ctcp.el: Don't require liece-q-ccl.el.
 
+2002-03-25  Daiki Ueno  <daiki@xemacs.org>
+
+       * Makefile.lisp (FLAGS): Don't set this if it is imported.
+
+       * liece-ctcp.el: Don't throw an error when liece-q-ccl is not found.
+
 2002-03-24  Daiki Ueno  <daiki@xemacs.org>
 
        * liece-coding.el (liece-mime-charset-for-write): Use
        `mime-charset-to-coding-system' instead of `mime-charset-p'.
-       (liece-mime-charset-for-read): Ditto.
- 
+       (liece-mime-charset-for-read): Ditto.
+
 2002-03-20  Daiki Ueno  <ueno@unixuser.org>
 
        * gettext.el (bind-text-domain): Respect LC_ALL and LC_MESSAGES;