From e2d90faf7ea70d86768c62a99f97d62636ff7b9b Mon Sep 17 00:00:00 2001 From: morioka Date: Thu, 16 Apr 1998 23:54:22 +0000 Subject: [PATCH] emu-latin1.el does not require 'emu-xemacs or 'emu-e19. --- emu.el | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/emu.el b/emu.el index ffdbd72..7aef622 100644 --- a/emu.el +++ b/emu.el @@ -100,14 +100,22 @@ (or (and running-xemacs-19 (>= emacs-minor-version 14)) running-xemacs-20-or-later)) -(cond (running-mule-merged-emacs +(cond (running-xemacs + ;; for XEmacs + (cond ((featurep 'mule) + ;; for XEmacs with MULE + (require 'emu-x20) + ) + (t + ;; for XEmacs without MULE + (require 'emu-xemacs) + (require 'emu-latin1) + )) + ) + (running-mule-merged-emacs ;; for Emacs 20.1 and 20.2 (require 'emu-e20) ) - (running-xemacs-with-mule - ;; for XEmacs with mule - (require 'emu-x20) - ) ((boundp 'MULE) ;; for MULE 1.* and 2.* (require 'emu-mule) @@ -117,7 +125,8 @@ (require 'emu-nemacs) ) (t - ;; for Emacs 19 and XEmacs without mule + ;; for Emacs 19 + (require 'emu-e19) (require 'emu-latin1) )) -- 1.7.10.4