(functionp): Typo fixed.

[elisp/apel.git] / EMU-ELS

diff --git a/EMU-ELS b/EMU-ELS
index 3611d43..1ffde2d 100644 (file)
--- a/EMU-ELS
+++ b/EMU-ELS
@@ -8,33 +8,40 @@
                        (if (or running-emacs-19_29-or-later
                                running-xemacs-19_14-or-later)
                            '(richtext)
-                         '(tinyrich)
-                         )))
+                         '(tinyrich))))
+
+(setq pcustom-modules (if (and (module-installed-p 'custom)
+                              ;; new custom requires widget.
+                              (module-installed-p 'widget))
+                         '(pcustom)
+                       ;; XXX: order is significant in current make process.
+                       '(tinycustom pcustom)))
 
 (let ((poe-modules '(poe))
       (poem-modules '(poem))
       (mcs-modules '(mcharset))
       (invisible-modules '(invisible))
-      pccl-modules)
+      (pccl-modules '(pccl)))
   (cond ((featurep 'xemacs)
         (setq poe-modules (cons 'poe-xemacs poe-modules)
               invisible-modules (cons 'inv-xemacs invisible-modules))
         )
        ((>= emacs-major-version 19)
-        (setq poe-modules (cons 'poe-19 poe-modules)
-              invisible-modules (cons 'inv-19 invisible-modules))
+        (setq invisible-modules (cons 'inv-19 invisible-modules))
         )
        (t
         (setq poe-modules (cons 'poe-18 poe-modules)
               invisible-modules (cons 'inv-18 invisible-modules))
         ))
+  (or running-emacs-19_29-or-later
+      (setq poe-modules (cons 'localhook poe-modules)))
   (cond ((featurep 'mule)
         (cond ((featurep 'xemacs)
                (setq poem-modules (cons 'poem-xm (cons 'poem-20
                                                        poem-modules))
                      mcs-modules (cons 'mcs-xm (cons 'mcs-20 mcs-modules)))
                (if (>= emacs-major-version 21)
-                   (setq pccl-modules '(pccl-20 pccl))
+                   (setq pccl-modules (cons 'pccl-20 pccl-modules))
                  )
                )
               ((>= emacs-major-version 20)
@@ -42,7 +49,7 @@
                                                         poem-modules))
                      mcs-modules (cons 'mcs-e20 (cons 'mcs-20
                                                       mcs-modules))
-                     pccl-modules '(pccl-20 pccl))
+                     pccl-modules (cons 'pccl-20 pccl-modules))
                (setq poem-modules
                      (cons
                       (if (and
@@ -55,7 +62,7 @@
               (t
                (setq poem-modules (cons 'poem-om poem-modules)
                      mcs-modules (cons 'mcs-om mcs-modules)
-                     pccl-modules '(pccl-om pccl)
+                     pccl-modules (cons 'pccl-om pccl-modules)
                      emu-modules (cons 'emu-mule emu-modules))
                ))
         )
@@ -63,16 +70,22 @@
         (setq poem-modules (cons 'poem-nemacs poem-modules)
               mcs-modules (cons 'mcs-nemacs mcs-modules))
         )
+       ((featurep 'file-coding)
+        (setq poem-modules (cons 'poem-xfc poem-modules)
+              mcs-modules (cons 'mcs-ltn1 mcs-modules))
+        )
        (t
         (setq poem-modules (cons 'poem-ltn1 poem-modules)
               mcs-modules (cons 'mcs-ltn1 mcs-modules))
         ))
-  
+
   (setq emu-modules (append poe-modules poem-modules
                            mcs-modules invisible-modules
-                           pccl-modules
+                           pccl-modules pcustom-modules
                            emu-modules))
+
   (setq emu-modules (cons 'broken emu-modules))
+  (setq emu-modules (cons 'static emu-modules))
   )
 
 ;;; EMU-ELS ends here