(emu-modules): Don't include `pccl-20' for XEmacs 20 and earlier.

diff --git a/ChangeLog b/ChangeLog
index 9903d10..49a6c51 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-04-25  Katsumi Yamaoka   <yamaoka@jpl.org>
+
+       * EMU-ELS (emu-modules): Don't include `pccl-20' for XEmacs 20 and
+       earlier.
+
 2000-03-25  Mikio Nakajima  <minakaji@osaka.email.ne.jp>
 
        * pym.el: Define edebug specs for `static-if', `static-when',

diff --git a/EMU-ELS b/EMU-ELS
index 677ebfc..43ddc3b 100644 (file)
--- a/EMU-ELS
+++ b/EMU-ELS
@@ -50,20 +50,24 @@
 
    ;; pccl modules; pccl modules depend on broken.
    (cond
-    ((featurep 'mule)
+    ((featurep 'xemacs)
      (cond
       ;; XEmacs 21 w/ mule.
-      ((and (featurep 'xemacs)
+      ((and (featurep 'mule)
            (>= emacs-major-version 21))
        '(pccl-20 pccl))
+      (t
+       '(pccl))))
+    ((featurep 'mule)
+     (cond
       ;; Emacs 20.
       ((>= emacs-major-version 20)
        '(pccl-20 pccl))
+      ;; Mule 1.* and 2.*.
       (t
-       ;; Mule 1.* and 2.*.
        '(pccl-om pccl))))
-     (t
-      '(pccl)))
+    (t
+     '(pccl)))
 
    ;; pces modules; pces modules depend on poe.
    (cond