(detect-mime-charset-region): Don't call

[elisp/apel.git] / EMU-ELS

diff --git a/EMU-ELS b/EMU-ELS
index b021714..39259c4 100644 (file)
--- a/EMU-ELS
+++ b/EMU-ELS
@@ -14,22 +14,27 @@
 (let ((poe-modules '(poe))
       (poem-modules '(poem))
       (mcs-modules '(mcharset))
-      pccl-modules)
-  (setq poe-modules (cons (cond ((featurep 'xemacs)
-                                'poe-xemacs)
-                               ((>= emacs-major-version 19)
-                                'poe-19)
-                               (t
-                                'poe-18))
-                         poe-modules))
-  
+      (invisible-modules '(invisible))
+      (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 invisible-modules (cons 'inv-19 invisible-modules))
+        )
+       (t
+        (setq poe-modules (cons 'poe-18 poe-modules)
+              invisible-modules (cons 'inv-18 invisible-modules))
+        ))
   (cond ((featurep 'mule)
-        (setq pccl-modules '(pccl))
         (cond ((featurep 'xemacs)
                (setq poem-modules (cons 'poem-xm (cons 'poem-20
                                                        poem-modules))
-                     mcs-modules (cons 'mcs-xm (cons 'mcs-20 mcs-modules))
-                     pccl-modules (cons 'pccl-20 pccl-modules))
+                     mcs-modules (cons 'mcs-xm (cons 'mcs-20 mcs-modules)))
+               (if (>= emacs-major-version 21)
+                   (setq pccl-modules (cons 'pccl-20 pccl-modules))
+                 )
                )
               ((>= emacs-major-version 20)
                (setq poem-modules (cons 'poem-e20 (cons 'poem-20
@@ -37,7 +42,6 @@
                      mcs-modules (cons 'mcs-e20 (cons 'mcs-20
                                                       mcs-modules))
                      pccl-modules (cons 'pccl-20 pccl-modules))
-
                (setq poem-modules
                      (cons
                       (if (and
@@ -64,7 +68,8 @@
         ))
   
   (setq emu-modules (append poe-modules poem-modules
-                           mcs-modules pccl-modules
+                           mcs-modules invisible-modules
+                           pccl-modules
                            emu-modules))
   (setq emu-modules (cons 'broken emu-modules))
   )