* liece-modules.el: Simplified.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c283e97..2aaf195 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2001-01-02   Daiki Ueno  <ueno@unixuser.org>
+
+       * liece-modules.el: Simplified.
+
 2000-12-09   Tanaka Akira  <akr@m17n.org>
 
        * liece.el (liece-refresh-buffer-window): Simplified.

diff --git a/lisp/liece-modules.el b/lisp/liece-modules.el
index a5d1222..14c5b5e 100644 (file)
--- a/lisp/liece-modules.el
+++ b/lisp/liece-modules.el
@@ -3,7 +3,6 @@
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Created: 1999-04-12
-;; Revised: 1999-03-02
 ;; Keywords: IRC, liece, APEL
 
 ;; This file is part of Liece.
@@ -30,8 +29,7 @@
 ;;; Code:
 
 (defvar liece-modules-to-compile
-  '(queue-m
-    gettext
+  '(gettext
     liece-clfns
     liece-handler
     liece-compat
@@ -65,33 +63,24 @@
     liece-window
     liece))
 
-(require 'emu)
 (if (featurep 'xemacs)
-    (add-to-list 'liece-modules-to-compile 'liece-xemacs)
-  (add-to-list 'liece-modules-to-compile 'liece-emacs)
-  (if (fboundp 'set-face-stipple)
-      (add-to-list 'liece-modules-to-compile 'bitmap-stipple)))
+    (push 'liece-xemacs liece-modules-to-compile)
+  (push 'liece-emacs liece-modules-to-compile))
 
-(when (featurep 'mule)
-  (add-to-list 'liece-modules-to-compile 'liece-coding))
+(if (fboundp 'set-face-stipple)
+    (push 'bitmap-stipple liece-modules-to-compile))
 
-(condition-case ()
-    (progn
-      (require 'pccl)
-      (require 'ccl))
-  (error nil))
+(if (featurep 'mule)
+    (push 'liece-coding liece-modules-to-compile))
 
-(require 'broken)
+(require 'pccl)
 
 (unless-broken ccl-usable
-  (add-to-list 'liece-modules-to-compile 'liece-q-ccl))
+  (push 'liece-q-ccl liece-modules-to-compile))
 
-(condition-case ()
-    (require 'cus-face)
-  (file-error nil))
+(setq liece-modules (cons 'liece-setup liece-modules-to-compile))
 
-(setq liece-modules (cons 'liece-setup
-                         (delq 'queue-m liece-modules-to-compile)))
+(push 'queue-m liece-modules-to-compile)
 
 (provide 'liece-modules)