From f4712a9facdb878f0fae3d5edb9a3ac400c59480 Mon Sep 17 00:00:00 2001 From: tomo Date: Wed, 20 Dec 2000 05:30:31 +0000 Subject: [PATCH] Require mcs-20 if running with XEmacs-Mule and GNU Emacs 20.1 or later. --- mcharset.el | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/mcharset.el b/mcharset.el index 156c34e..3be62d1 100644 --- a/mcharset.el +++ b/mcharset.el @@ -28,24 +28,15 @@ (require 'pcustom) (cond ((featurep 'mule) - (cond ((featurep 'xemacs) - (require 'mcs-xm) - ) - ((>= emacs-major-version 20) - (require 'mcs-e20) - ) - (t - ;; for MULE 1.* and 2.* - (require 'mcs-om) - )) - ) + (if (>= emacs-major-version 20) + (require 'mcs-20) + ;; for MULE 1.* and 2.* + (require 'mcs-om))) ((boundp 'NEMACS) ;; for Nemacs and Nepoch - (require 'mcs-nemacs) - ) + (require 'mcs-nemacs)) (t - (require 'mcs-ltn1) - )) + (require 'mcs-ltn1))) (defcustom default-mime-charset-for-write (if (and (fboundp 'find-coding-system) -- 1.7.10.4