(emu-modules-to-compile): New variable which is used for compiling in APEL-MK.

If the feature `utf-2000' is provided, `mcs-xmu' is removed from its value
even if `emu-modules' contains it.
(emu-modules-not-to-compile): New variable.

diff --git a/EMU-ELS b/EMU-ELS
index a33a0f6..a6ceb82 100644 (file)
--- a/EMU-ELS
+++ b/EMU-ELS
@@ -17,6 +17,10 @@
                            '(richtext)
                          '(tinyrich))))
 
+(setq emu-modules-to-compile nil)
+
+(setq emu-modules-not-to-compile nil)
+
 (setq pcustom-modules (if (and (module-installed-p 'custom)
                               ;; new custom requires widget.
                               (module-installed-p 'widget))
@@ -75,9 +79,11 @@
   (cond ((featurep 'mule)
         (cond ((featurep 'xemacs)
                (setq poem-modules (cons 'poem-xm poem-modules)
-                     mcs-modules (cons 'mcs-xm (cons 'mcs-20 mcs-modules)))
-               (if (null (featurep 'utf-2000))
-                   (setq mcs-modules (cons 'mcs-xmu mcs-modules)))
+                     mcs-modules (append '(mcs-xmu mcs-xm mcs-20)
+                                         mcs-modules))
+               (if (featurep 'utf-2000)
+                   (setq emu-modules-not-to-compile
+                         (cons 'mcs-xmu emu-modules-not-to-compile)))
                (if (>= emacs-major-version 21)
                    (setq pccl-modules (cons 'pccl-20 pccl-modules))
                  ))
@@ -120,4 +126,14 @@
   (setq emu-modules (cons 'static emu-modules))
   )
 
+(let ((modules emu-modules)
+      module)
+  (while modules
+    (setq module (car modules)
+         modules (cdr modules))
+    (if (memq module emu-modules-not-to-compile)
+       nil
+      (setq emu-modules-to-compile (nconc emu-modules-to-compile
+                                         (list module))))))
+
 ;;; EMU-ELS ends here