update.

[elisp/apel.git] / EMU-ELS

diff --git a/EMU-ELS b/EMU-ELS
index 595c8b1..088cb69 100644 (file)
--- a/EMU-ELS
+++ b/EMU-ELS
@@ -8,15 +8,14 @@
                        (if (or running-emacs-19_29-or-later
                                running-xemacs-19_14-or-later)
                            '(richtext)
-                         '(tinyrich)
-                         )))
+                         '(tinyrich))))
 
-(setq pcustom-modules
-      (cons 'pcustom
-           (if (module-installed-p 'custom)
-               nil
-             '(tinycustom)
-             )))
+(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))
@@ -29,9 +28,13 @@
         )
        ((>= emacs-major-version 19)
         (setq invisible-modules (cons 'inv-19 invisible-modules))
+        (if (and (= emacs-major-version 19)
+                 (<= emacs-minor-version 28))
+            (setq poe-modules (cons 'localhook poe-modules))
+          )
         )
        (t
-        (setq poe-modules (cons 'poe-18 poe-modules)
+        (setq poe-modules (cons 'poe-18 (cons 'localhook poe-modules))
               invisible-modules (cons 'inv-18 invisible-modules))
         ))
   (cond ((featurep 'mule)
@@ -69,16 +72,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 pcustom-modules
                            emu-modules))
+
   (setq emu-modules (cons 'broken emu-modules))
+  (setq emu-modules (cons 'static emu-modules))
   )
 
 ;;; EMU-ELS ends here