X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=EMU-ELS;h=39259c4ea7ff3160217e23e0f9303939e2892b6c;hb=acaf4f22fb7441eb1e0a5c9541b31f1352a271e2;hp=625789e3905ec9917976a493978c43c4684aa994;hpb=0517b0f2db395cbede6d1bc7607ab384514225d0;p=elisp%2Fapel.git

diff --git a/EMU-ELS b/EMU-ELS
index 625789e..39259c4 100644
--- a/EMU-ELS
+++ b/EMU-ELS
@@ -4,48 +4,74 @@
 
 ;;; Code:
 
-(setq emu-modules
-      (cons
-       'emu
-       (if (or running-emacs-19_29-or-later
-	       running-xemacs-19_14-or-later)
-	   '(richtext)
-	 '(tinyrich)
-	 )))
+(setq emu-modules (cons 'emu
+			(if (or running-emacs-19_29-or-later
+				running-xemacs-19_14-or-later)
+			    '(richtext)
+			  '(tinyrich)
+			  )))
 
-(setq emu-modules
-      (nconc
-       (cond (running-xemacs
-	      ;; for XEmacs
-	      (cons 'emu-xemacs
-		    (if (featurep 'mule)
-			'(emu-20 emu-x20) ; for XEmacs with MULE
-		      '(emu-latin1) ; for XEmacs without MULE
-		      ))
-	      )
-	     (running-mule-merged-emacs
-	      ;; for Emacs 20.1 or later
-	      (cons (if (= (length "あ") 1)
-			'emu-e20_3 ; for Emacs 20.3
-		      'emu-e20_2 ; for Emacs 20.1 and 20.2
-		      )
-		    '(emu-20 emu-e19 emu-e20))
-	      )
-	     ((boundp 'MULE)
-	      ;; for MULE 1.* and MULE 2.*
-	      (cons 'emu-mule
-		    (if running-emacs-18
-			'(emu-18 env)
-		      '(emu-e19)))
-	      )
-	     ((boundp 'NEMACS)
-	      ;; for NEmacs
-	      '(emu-18 emu-nemacs)
-	      )
-	     (t
-	      ;; for Emacs 19.34
-	      '(emu-e19 emu-latin1)
-	      ))
-       emu-modules))
+(let ((poe-modules '(poe))
+      (poem-modules '(poem))
+      (mcs-modules '(mcharset))
+      (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)
+	 (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 (cons 'pccl-20 pccl-modules))
+		  )
+		)
+	       ((>= emacs-major-version 20)
+		(setq poem-modules (cons 'poem-e20 (cons 'poem-20
+							 poem-modules))
+		      mcs-modules (cons 'mcs-e20 (cons 'mcs-20
+						       mcs-modules))
+		      pccl-modules (cons 'pccl-20 pccl-modules))
+		(setq poem-modules
+		      (cons
+		       (if (and
+			    (fboundp 'set-buffer-multibyte)
+			    (subrp (symbol-function 'set-buffer-multibyte)))
+			   'poem-e20_3
+			 'poem-e20_2)
+		       poem-modules))
+		)
+	       (t
+		(setq poem-modules (cons 'poem-om poem-modules)
+		      mcs-modules (cons 'mcs-om mcs-modules)
+		      pccl-modules (cons 'pccl-om pccl-modules)
+		      emu-modules (cons 'emu-mule emu-modules))
+		))
+	 )
+	((boundp 'NEMACS)
+	 (setq poem-modules (cons 'poem-nemacs poem-modules)
+	       mcs-modules (cons 'mcs-nemacs 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
+			    emu-modules))
+  (setq emu-modules (cons 'broken emu-modules))
+  )
 
 ;;; EMU-ELS ends here