From: morioka <morioka>
Date: Mon, 22 Jun 1998 12:29:11 +0000 (+0000)
Subject: Require `emu-20' in emu-x20.el.
X-Git-Tag: apel-8_16~50
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ee7c9e055f66688ad650e9c3fcc3c24578fc640;p=elisp%2Fapel.git

Require `emu-20' in emu-x20.el.
---

diff --git a/emu-x20.el b/emu-x20.el
index e63cda3..2281a91 100644
--- a/emu-x20.el
+++ b/emu-x20.el
@@ -28,6 +28,9 @@
 
 ;;; Code:
 
+(require 'emu-20)
+
+
 (and (coding-system-property 'iso-2022-jp 'input-charset-conversion)
      (copy-coding-system 'iso-2022-7bit 'iso-2022-jp))
 
diff --git a/emu.el b/emu.el
index 5752b03..0713415 100644
--- a/emu.el
+++ b/emu.el
@@ -103,16 +103,12 @@
 (cond (running-xemacs
        ;; for XEmacs
        (require 'emu-xemacs)
-       (cond ((featurep 'mule)
-	      ;; for XEmacs with MULE
-	      (require 'emu-20)
-	      (require 'emu-x20)
-	      )
-	     (t
-	      ;; for XEmacs without MULE
-	      (require 'emu-latin1)
-	      ))
-       )
+       (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)