From: yamaoka <yamaoka>
Date: Mon, 28 Feb 2000 07:02:25 +0000 (+0000)
Subject: (enriched-encode): Do nothing for it if FSF Emacs 19.28 and earlier
X-Git-Tag: apel-10_2~2
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f72402701e2c75f7c8b7ae3e672076a6be76f4b;p=elisp%2Fapel.git

(enriched-encode): Do nothing for it if FSF Emacs 19.28 and earlier
or XEmacs 19.13 and earlier is used.
---

diff --git a/ChangeLog b/ChangeLog
index bcc4303..a8883bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-02-28  Katsumi Yamaoka   <yamaoka@jpl.org>
+
+	* emu.el (enriched-encode): Do nothing for it if FSF Emacs 19.28
+	and earlier or XEmacs 19.13 and earlier is used.
+
 2000-02-25  Katsumi Yamaoka   <yamaoka@jpl.org>
 
 	* emu.el (enriched-encode): Allow the 3rd argument ORIG-BUF for old
diff --git a/emu.el b/emu.el
index cc8e3f8..fce2080 100644
--- a/emu.el
+++ b/emu.el
@@ -223,7 +223,8 @@ find-file-hooks, etc.
        (autoload 'enriched-decode "tinyrich")
        ))
 
-(if (or (< emacs-major-version 20)
+(if (or (and (eq emacs-major-version 19)
+	     (>= emacs-minor-version (if (featurep 'xemacs) 14 29)))
 	(and (eq emacs-major-version 20)
 	     (< emacs-minor-version (if (featurep 'xemacs) 3 1))))
     (eval-after-load "enriched"