tm 7.70.

wanderlust · Mar 9, 1998 · 73a694e · 73a694e
1 parent 84b9281
commit 73a694e
Show file tree

Hide file tree

Showing 5 changed files with 148 additions and 3 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,60 @@
+Tue Jul  9 13:16:23 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+	* tl: Version 7.31.1 was released.
+
+	* mu-replace.el (edit-replace-mode-map): Use function
+ 	`copy-keymap'.
+
+Mon Jul  8 07:46:02 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+	* emu-mule.el (mime-charset-to-coding-system): New function.
+
+	* emu-mule.el (mime-charset-coding-system-alist): New variable.
+
+	* emu-mule.el (detect-mime-charset-region): New function.
+
+	* emu-mule.el (charsets-to-mime-charset): New function.
+
+Mon Jul  8 06:49:48 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+	* tl-list.el (subsetp): wrote doc-string.
+
+	* emu-mule.el (default-mime-charset): New variable.
+
+	* emu-mule.el (charsets-mime-charset-alist): New variable.
+
+Thu Jul  4 16:57:52 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+	* mu-cite.el (compress-cited-prefix): check Message-Id.
+
+	* mu-cite.el (compress-cited-prefix): fixed.
+
+Wed Jul  3 06:27:10 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+	* emu.el (running-emacs-19_29-or-later): fixed.
+
+Wed Jul  3 05:59:24 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+	* emu.el (running-xemacs-20-or-later): New variable.
+	(running-xemacs-19_14-or-later): Use variable
+ 	`running-xemacs-20-or-later'.
+
+	* emu.el (running-emacs-19_29-or-later): fixed.
+
+Sun Jun 30 01:00:37 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+	* emu-x20.el (char-category): New function.
+
+Sat Jun 29 08:23:05 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+	* mu-cite.el (fill-cited-region):
+	modified about fill-prefix collecting.
+
+Sat Jun 29 08:03:34 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+	* tl-str.el (string-compare-from-top): New function.
+
+
 Thu Jun 27 17:29:23 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
 	* tl: Version 7.31 was released.

diff --git a/Makefile b/Makefile
@@ -21,7 +21,7 @@ FILES	= tl/README.en tl/Makefile tl/mk-tl tl/tl-els \
 		tl/*.el tl/*.bdf \
 		tl/doc/*.ol tl/doc/*.tex tl/doc/*.texi tl/ChangeLog
 
-TARFILE = tl-7.31.tar
+TARFILE = tl-7.31.1.tar
 
 
 elc:

diff --git a/emu-mule.el b/emu-mule.el
@@ -148,6 +148,81 @@ encoded in CODING-SYSTEM. [emu-mule.el]"
        )))
 
 
+;;; @ MIME charset
+;;;
+
+(defvar charsets-mime-charset-alist
+  (list
+   (cons (list lc-ascii)				'us-ascii)
+   (cons (list lc-ascii lc-ltn1)			'iso-8859-1)
+   (cons (list lc-ascii lc-ltn2)			'iso-8859-2)
+   (cons (list lc-ascii lc-ltn3)			'iso-8859-3)
+   (cons (list lc-ascii lc-ltn4)			'iso-8859-4)
+;;;(cons (list lc-ascii lc-crl)				'iso-8859-5)
+   (cons (list lc-ascii lc-crl)				'koi8-r)
+   (cons (list lc-ascii lc-arb)				'iso-8859-6)
+   (cons (list lc-ascii lc-grk)				'iso-8859-7)
+   (cons (list lc-ascii lc-hbw)				'iso-8859-8)
+   (cons (list lc-ascii lc-ltn5)			'iso-8859-9)
+   (cons (list lc-ascii lc-jp)				'iso-2022-jp)
+   (cons (list lc-ascii lc-kr)				'euc-kr)
+   (cons (list lc-ascii lc-big5-1 lc-big5-2)		'big5)
+   (cons (list lc-ascii lc-cn lc-jp lc-kr lc-jp2
+	       lc-ltn1 lc-grk)				'iso-2022-jp-2)
+   (cons (list lc-ascii lc-cn lc-jp lc-kr lc-jp2
+	       lc-cns1 lc-cns2 lc-ltn1 lc-grk)		'iso-2022-int-1)
+   ))
+
+(defvar default-mime-charset 'iso-2022-int-1)
+
+(defun charsets-to-mime-charset (charsets)
+  (if charsets
+      (or (catch 'tag
+	    (let ((rest charsets-mime-charset-alist)
+		  cell csl)
+	      (while (setq cell (car rest))
+		(if (catch 'not-subset
+		      (let ((set1 charsets)
+			    (set2 (car cell))
+			    obj)
+			(while set1
+			  (setq obj (car set1))
+			  (or (memq obj set2)
+			      (throw 'not-subset nil)
+			      )
+			  (setq set1 (cdr set1))
+			  )
+			t))
+		    (throw 'tag (cdr cell))
+		  )
+		(setq rest (cdr rest))
+		)))
+	  default-mime-charset)))
+
+(defun detect-mime-charset-region (beg end)
+  (charsets-to-mime-charset
+   (cons lc-ascii (find-charset-region beg end))))
+
+(defvar mime-charset-coding-system-alist
+  '((iso-8859-1      . *ctext*)
+    (gb2312          . *euc-china*)
+    (koi8-r          . *koi8*)
+    (iso-2022-jp-2   . *iso-2022-ss2-7*)
+    (x-iso-2022-jp-2 . *iso-2022-ss2-7*)
+    (shift_jis       . *sjis*)
+    (x-shiftjis      . *sjis*)
+    ))
+
+(defun mime-charset-to-coding-system (charset)
+  (if (stringp charset)
+      (setq charset (intern (downcase charset)))
+    )
+  (or (cdr (assq charset mime-charset-coding-system-alist))
+      (let ((cs (intern (concat "*" (symbol-name charset) "*"))))
+	(and (coding-system-p cs) cs)
+	)))
+
+
 ;;; @ character
 ;;;
 

diff --git a/emu-x20.el b/emu-x20.el
@@ -189,6 +189,17 @@ in the region between START and END.
 
 (defalias 'char-leading-char 'char-charset)
 
+(defun char-category (character)
+  "Return string of category mnemonics for CHAR in TABLE.
+CHAR can be any multilingual character
+TABLE defaults to the current buffer's category table.
+\[emu-x20.el; Mule emulating function]"
+  (mapconcat (lambda (chr)
+	       (char-to-string (int-char chr))
+	       )
+	     (char-category-list character)
+	     ""))
+
 
 ;;; @ string
 ;;;

diff --git a/emu.el b/emu.el
@@ -37,14 +37,16 @@
 			       (= emacs-major-version 19)))
 (defvar running-xemacs-20 (and running-xemacs
 			       (= emacs-major-version 20)))
+(defvar running-xemacs-20-or-later (and running-xemacs
+					(>= emacs-major-version 20)))
 (defvar running-xemacs-19_14-or-later
   (or (and running-xemacs-19 (>= emacs-minor-version 14))
-      (>= emacs-major-version 20)))
+      running-xemacs-20-or-later))
 (defvar running-emacs-19 (and (not running-xemacs)
 			      (= emacs-major-version 19)))
 (defvar running-emacs-19_29-or-later
   (or (and running-emacs-19 (>= emacs-minor-version 29))
-      (>= emacs-major-version 20)))
+      (and (not running-xemacs)(>= emacs-major-version 20))))
 
 (cond ((boundp 'MULE)
        (require 'emu-mule)