From: morioka <morioka>
Date: Thu, 17 Sep 1998 14:41:57 +0000 (+0000)
Subject: Modify conditions to load sub-modules.
X-Git-Tag: poe-199811302358~30
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e701083104c89d6d19e6f2b41bf866f00d62a16;p=elisp%2Fapel.git

Modify conditions to load sub-modules.
---

diff --git a/emu.el b/emu.el
index de87f70..0af9f1a 100644
--- a/emu.el
+++ b/emu.el
@@ -77,29 +77,28 @@
 (require 'poem)
 (require 'mcharset)
 
-(cond (running-xemacs
-       (if (featurep 'mule)
-	   ;; for XEmacs with MULE
-	   (require 'emu-x20)
-	 ;; for XEmacs without MULE
-	 (require 'emu-latin1)
-	 ))
-      (running-mule-merged-emacs
-       ;; for Emacs 20.1 and 20.2
-       (require 'emu-e20)
-       (defalias 'insert-binary-file-contents-literally
-	 'insert-file-contents-literally)
-       )
-      ((boundp 'MULE)
-       ;; for MULE 1.* and 2.*
-       (require 'emu-mule)
+(cond ((featurep 'mule)
+       (cond ((featurep 'xemacs)
+	      ;; for XEmacs with MULE
+	      (require 'emu-x20)
+	      )
+	     ((>= emacs-major-version 20)
+	      ;; for Emacs 20
+	      (require 'emu-e20)
+	      (defalias 'insert-binary-file-contents-literally
+		'insert-file-contents-literally)
+	      )
+	     (t
+	      ;; for MULE 1.* and 2.*
+	      (require 'emu-mule)
+	      ))
        )
       ((boundp 'NEMACS)
        ;; for NEmacs and NEpoch
        (require 'emu-nemacs)
        )
       (t
-       ;; for Emacs 19
+       ;; for Emacs 19 and XEmacs without MULE
        (require 'emu-latin1)
        ))