Permalink
Browse files

tm 7.57.

  • Loading branch information...
1 parent fde522d commit 1dee2739b29b00503169a7239a31e0d4d75e0c25 morioka committed Mar 9, 1998
Showing with 74 additions and 4 deletions.
  1. +31 −0 ChangeLog
  2. +1 −1 Makefile
  3. +13 −1 emu-x20.el
  4. +29 −2 emu.el
View
@@ -1,3 +1,34 @@
+Tue May 7 18:16:38 1996 MORIOKA Tomohiko <morioka@jaist.ac.jp>
+
+ * tl: Version 7.22.2 was released.
+
+ * emu-x20.el (*hz*, *big5*, *euc-kr*, *koi8*): New constant.
+
+Tue May 7 17:50:26 1996 MORIOKA Tomohiko <morioka@jaist.ac.jp>
+
+ * emu.el (running-xemacs-19): Definition was changed.
+ (running-xemacs-20): Definition was changed.
+
+Tue May 7 17:15:31 1996 MORIOKA Tomohiko <morioka@jaist.ac.jp>
+
+ * tl-els: bitmap.el must be regarded as Mule depended module.
+
+Tue May 7 16:40:44 1996 MORIOKA Tomohiko <morioka@jaist.ac.jp>
+
+ * emu-x20.el (xemacs-beta-version): New variable.
+ (code-converter-is-broken): Use variable `xemacs-beta-version'.
+
+Tue May 7 07:00:50 1996 Shuhei KOBAYASHI <shuhei-k@jaist.ac.jp>
+
+ * emu.el, mu-bbdb.el, mu-cite.el: KOBAYASHI Shuhei's address was
+ changed.
+
+Tue May 7 06:29:59 1996 MORIOKA Tomohiko <morioka@jaist.ac.jp>
+
+ * emu.el (running-xemacs-19_14-or-later): New variable.
+ setting for text/enriched and text/richtext.
+
+
Mon Apr 29 06:30:47 1996 MORIOKA Tomohiko <morioka@jaist.ac.jp>
* tl: Version 7.22.1 was released.
View
@@ -21,7 +21,7 @@ FILES = tl/README.en tl/Makefile tl/mk-tl tl/tl-els \
tl/*.el tl/*.bdf \
tl/doc/*.texi tl/ChangeLog
-TARFILE = tl-7.22.1.tar
+TARFILE = tl-7.22.2.tar
elc:
View
@@ -27,6 +27,13 @@
;;;
;;; Code:
+(defvar xemacs-beta-version
+ (if (string-match "(beta\\([0-9]+\\))" emacs-version)
+ (string-to-number
+ (substring emacs-version (match-beginning 1)(match-end 1))
+ )))
+
+
;;; @ character set
;;;
@@ -75,8 +82,13 @@ in the region between START and END.
(defconst *noconv* 'noconv)
(defconst *ctext* 'ctext)
+(defconst *hz* 'hz)
+(defconst *big5* 'big5)
+(defconst *euc-kr* 'euc-kr)
+(defconst *koi8* nil)
-(defvar code-converter-is-broken (string-match "(beta17)" emacs-version))
+(defvar code-converter-is-broken
+ (and xemacs-beta-version (<= xemacs-beta-version 18)))
(if code-converter-is-broken
(progn
View
31 emu.el
@@ -5,7 +5,7 @@
;;; Copyright (C) 1995,1996 MORIOKA Tomohiko
;;;
;;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;;; modified by Shuhei KOBAYASHI <shuhei@cmpt01.phys.tohoku.ac.jp>
+;;; modified by KOBAYASHI Shuhei <shuhei-k@jaist.ac.jp>
;;; Version:
;;; $Id$
;;; Keywords: emulation, compatibility, NEmacs, Mule, XEmacs
@@ -33,8 +33,13 @@
(defvar running-emacs-18 (<= emacs-major-version 18))
(defvar running-xemacs (string-match "XEmacs" emacs-version))
+(defvar running-xemacs-19 (and running-xemacs
+ (= emacs-major-version 19)))
(defvar running-xemacs-20 (and running-xemacs
- (>= emacs-major-version 20)))
+ (= emacs-major-version 20)))
+(defvar running-xemacs-19_14-or-later
+ (or (and running-xemacs-19 (>= emacs-minor-version 14))
+ (>= emacs-major-version 20)))
(defvar running-emacs-19 (and (not running-xemacs)
(= emacs-major-version 19)))
(defvar running-emacs-19_29-or-later
@@ -104,6 +109,28 @@
)
+;;; @ for text/richtext and text/enriched
+;;;
+
+(cond ((or running-emacs-19_29-or-later running-xemacs-19_14-or-later)
+ ;; have enriched.el
+ (autoload 'richtext-decode "richtext")
+ (or (assq 'text/richtext format-alist)
+ (setq format-alist
+ (cons
+ (cons 'text/richtext
+ '("Extended MIME text/richtext format."
+ "Content-[Tt]ype:[ \t]*text/richtext"
+ richtext-decode richtext-encode t enriched-mode))
+ format-alist)))
+ )
+ (t
+ ;; don't have enriched.el
+ (autoload 'richtext-decode "tinyrich")
+ (autoload 'enriched-decode "tinyrich")
+ ))
+
+
;;; @ end
;;;

0 comments on commit 1dee273

Please sign in to comment.