From 077aca4225c4c8ce135c8ec979d7eaf9e7fc4837 Mon Sep 17 00:00:00 2001 From: morioka Date: Mon, 9 Mar 1998 19:37:56 +0000 Subject: [PATCH] tm 7.72. --- ChangeLog | 51 +++++++++++++++++++++++++++++++++++++++++ emu-e19.el | 35 +++++++++++------------------ emu-mule.el | 41 ++++++++++++++++----------------- emu-nemacs.el | 70 ++++++++++++++++++++++++++------------------------------- emu-x20.el | 28 +++++++++++++++-------- 5 files changed, 134 insertions(+), 91 deletions(-) diff --git a/ChangeLog b/ChangeLog index c1574ea..9bde53b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,54 @@ +Wed Jul 17 05:35:50 1996 MORIOKA Tomohiko + + * tl: Version 7.43 was released. + +Mon Jul 15 08:29:22 1996 MORIOKA Tomohiko + + * emu-x20.el: Alias `character-decode-region' was abolished. + + * emu-x20.el: Alias `character-decode-string' was abolished. + + * emu-e19.el, emu-nemacs.el, emu-mule.el: Function + `character-decode-region' was abolished. + + * emu-e19.el, emu-nemacs.el: Function `character-decode-string' + was abolished. + +Sun Jul 14 15:00:32 1996 MORIOKA Tomohiko + + * emu-nemacs.el (encode-mime-charset-region): check kanji-code. + (decode-mime-charset-region): check kanji-code. + +Sun Jul 14 14:56:46 1996 MORIOKA Tomohiko + + * emu-e19.el, emu-nemacs.el, emu-x20.el, emu-mule.el + (decode-mime-charset-region): New function. + +Sun Jul 14 12:24:45 1996 MORIOKA Tomohiko + + * emu-x20.el: Alias `character-encode-region' was abolished. + + * emu-e19.el, emu-nemacs.el, emu-mule.el: Function + `character-encode-region' was abolished. + +Sun Jul 14 12:18:35 1996 MORIOKA Tomohiko + + * emu-mule.el (decode-mime-charset-string): Use function + `character-decode-string'. + +Sun Jul 14 11:47:20 1996 MORIOKA Tomohiko + + * emu-mule.el, emu-e19.el, emu-nemacs.el: Function + `character-encode-string' was abolished. + + * emu-x20.el: Alias `character-encode-string' was abolished. + +Sun Jul 14 11:29:02 1996 MORIOKA Tomohiko + + * emu-nemacs.el, emu-e19.el, emu-x20.el, emu-mule.el + (decode-mime-charset-string): New function. + + Thu Jul 11 14:11:12 1996 MORIOKA Tomohiko * tl: Version 7.36 was released. diff --git a/emu-e19.el b/emu-e19.el index a000f4e..67519ee 100644 --- a/emu-e19.el +++ b/emu-e19.el @@ -6,7 +6,7 @@ ;;; ;;; Author: MORIOKA Tomohiko ;;; Version: -;;; $Id: emu-e19.el,v 7.24 1996/07/11 08:51:00 morioka Exp $ +;;; $Id: emu-e19.el,v 7.30 1996/07/15 08:26:24 morioka Exp $ ;;; Keywords: emulation, compatibility, Mule, Latin-1 ;;; ;;; This file is part of tl (Tiny Library). @@ -99,24 +99,6 @@ (defconst *ctext* nil) (defconst *noconv* nil) -(defun character-encode-string (str coding-system) - "Encode the string STR which is encoded in CODING-SYSTEM. [emu-e19.el]" - str) - -(defun character-decode-string (str coding-system) - "Decode the string STR which is encoded in CODING-SYSTEM. [emu-e19.el]" - str) - -(defun character-encode-region (start end coding-system) - "Encode the text between START and END which is -encoded in CODING-SYSTEM. [emu-e19.el]" - t) - -(defun character-decode-region (start end coding-system) - "Decode the text between START and END which is -encoded in CODING-SYSTEM. [emu-e19.el]" - t) - (defun code-convert-string (str ic oc) "Convert code in STRING from SOURCE code to TARGET code, On successful converion, returns the result string, @@ -164,12 +146,21 @@ between START and END. [emu-e19.el; Mule emulating function]" 'us-ascii)) (defun encode-mime-charset-region (start end charset) - "Encode the text between START and END which is -encoded in MIME CHARSET. [emu-e19.el]" + "Encode the text between START and END as MIME CHARSET. +\[emu-e19.el]" + ) + +(defun decode-mime-charset-region (start end charset) + "Decode the text between START and END as MIME CHARSET. +\[emu-e19.el]" ) (defun encode-mime-charset-string (string charset) - "Encode the STRING which is encoded in MIME CHARSET. [emu-e19.el]" + "Encode the STRING as MIME CHARSET. [emu-e19.el]" + string) + +(defun decode-mime-charset-string (string charset) + "Decode the STRING as MIME CHARSET. [emu-e19.el]" string) diff --git a/emu-mule.el b/emu-mule.el index 2d3fb1d..c58d7f4 100644 --- a/emu-mule.el +++ b/emu-mule.el @@ -6,7 +6,7 @@ ;;; ;;; Author: MORIOKA Tomohiko ;;; Version: -;;; $Id: emu-mule.el,v 7.36 1996/07/11 09:03:20 morioka Exp $ +;;; $Id: emu-mule.el,v 7.43 1996/07/15 08:21:54 morioka Exp $ ;;; Keywords: emulation, compatibility, Mule ;;; ;;; This file is part of tl (Tiny Library). @@ -69,12 +69,6 @@ ;;; @ coding system ;;; -(defun character-encode-string (str coding-system) - "Encode the string STR which is encoded in CODING-SYSTEM. -\[emu-mule.el]" - (code-convert-string str *internal* coding-system) - ) - (defun character-decode-string (str coding-system) "Decode the string STR which is encoded in CODING-SYSTEM. \[emu-mule.el]" @@ -92,18 +86,6 @@ (concat ret (substring str len)) )) -(defun character-encode-region (start end coding-system) - "Encode the text between START and END which is -encoded in CODING-SYSTEM. [emu-mule.el]" - (code-convert start end *internal* coding-system) - ) - -(defun character-decode-region (start end coding-system) - "Decode the text between START and END which is -encoded in CODING-SYSTEM. [emu-mule.el]" - (code-convert start end coding-system *internal*) - ) - (defmacro as-binary-process (&rest body) (` (let (selective-display ; Disable ^M to nl translation. ;; Mule @@ -167,20 +149,35 @@ encoded in CODING-SYSTEM. [emu-mule.el]" (cons lc-ascii (find-charset-region start end)))) (defun encode-mime-charset-region (start end charset) - "Encode the text between START and END which is -encoded in MIME CHARSET. [emu-mule.el]" + "Encode the text between START and END as MIME CHARSET. +\[emu-mule.el]" (let ((cs (mime-charset-to-coding-system charset))) (if cs (code-convert start end *internal* cs) ))) +(defun decode-mime-charset-region (start end charset) + "Decode the text between START and END as MIME CHARSET. +\[emu-mule.el]" + (let ((cs (mime-charset-to-coding-system charset))) + (if cs + (code-convert start end cs *internal*) + ))) + (defun encode-mime-charset-string (string charset) - "Encode the STRING which is encoded in MIME CHARSET. [emu-mule.el]" + "Encode the STRING as MIME CHARSET. [emu-mule.el]" (let ((cs (mime-charset-to-coding-system charset))) (if cs (code-convert-string string *internal* cs) string))) +(defun decode-mime-charset-string (string charset) + "Decode the STRING which is encoded in MIME CHARSET. [emu-mule.el]" + (let ((cs (mime-charset-to-coding-system charset))) + (if cs + (character-decode-string string cs) + string))) + ;;; @ character ;;; diff --git a/emu-nemacs.el b/emu-nemacs.el index aa44107..385369f 100644 --- a/emu-nemacs.el +++ b/emu-nemacs.el @@ -7,7 +7,7 @@ ;;; Author: MORIOKA Tomohiko ;;; modified by KOBAYASHI Shuhei ;;; Version: -;;; $Id: emu-nemacs.el,v 7.32 1996/07/11 13:59:54 morioka Exp $ +;;; $Id: emu-nemacs.el,v 7.39 1996/07/15 08:24:46 morioka Exp $ ;;; Keywords: emulation, compatibility, NEmacs, Mule ;;; ;;; This file is part of tl (Tiny Library). @@ -110,34 +110,6 @@ (defconst *internal* 3) (defconst *euc-japan* 3) -(defun character-encode-string (str coding-system) - "Encode the string STR which is encoded in CODING-SYSTEM. [emu-nemacs.el]" - (convert-string-kanji-code str 3 coding-system) - ) - -(defun character-decode-string (str coding-system) - "Decode the string STR which is encoded in CODING-SYSTEM. [emu-nemacs.el]" - (convert-string-kanji-code str coding-system 3) - ) - -(defun character-encode-region (start end coding-system) - "Encode the text between START and END which is -encoded in CODING-SYSTEM. [emu-nemacs.el]" - (save-excursion - (save-restriction - (narrow-to-region beg end) - (convert-region-kanji-code start end 3 coding-system) - ))) - -(defun character-decode-region (start end coding-system) - "Decode the text between START and END which is -encoded in CODING-SYSTEM. [emu-nemacs.el]" - (save-excursion - (save-restriction - (narrow-to-region beg end) - (convert-region-kanji-code start end coding-system 3) - ))) - (defun code-convert-string (str ic oc) "Convert code in STRING from SOURCE code to TARGET code, On successful converion, returns the result string, @@ -216,23 +188,45 @@ else returns nil. [emu-nemacs.el; Mule emulating function]" 'us-ascii)) (defun encode-mime-charset-region (start end charset) - "Encode the text between START and END which is -encoded in MIME CHARSET. [emu-nemacs.el]" + "Encode the text between START and END as MIME CHARSET. +\[emu-nemacs.el]" (let ((cs (mime-charset-to-coding-system charset))) - (if cs - (save-excursion - (save-restriction - (narrow-to-region start end) - (convert-region-kanji-code start end 3 cs) - ))))) + (and (numberp cs) + (or (= cs 3) + (save-excursion + (save-restriction + (narrow-to-region start end) + (convert-region-kanji-code start end 3 cs) + )) + )))) + +(defun decode-mime-charset-region (start end charset) + "Decode the text between START and END as MIME CHARSET. +\[emu-nemacs.el]" + (let ((cs (mime-charset-to-coding-system charset))) + (and (numberp cs) + (or (= cs 3) + (save-excursion + (save-restriction + (narrow-to-region start end) + (convert-region-kanji-code start end cs 3) + )) + )))) (defun encode-mime-charset-string (string charset) - "Encode the STRING which is encoded in MIME CHARSET. [emu-nemacs.el]" + "Encode the STRING as MIME CHARSET. [emu-nemacs.el]" (let ((cs (mime-charset-to-coding-system charset))) (if cs (convert-string-kanji-code string 3 cs) string))) +(defun decode-mime-charset-string (string charset) + "Decode the STRING as MIME CHARSET. [emu-nemacs.el]" + (let ((cs (mime-charset-to-coding-system charset))) + (if cs + (convert-string-kanji-code string cs 3) + string))) + ;;; @ character ;;; diff --git a/emu-x20.el b/emu-x20.el index 4cd7ccc..a184284 100644 --- a/emu-x20.el +++ b/emu-x20.el @@ -6,7 +6,7 @@ ;;; ;;; Author: MORIOKA Tomohiko ;;; Version: -;;; $Id: emu-x20.el,v 7.27 1996/07/11 09:02:01 morioka Exp $ +;;; $Id: emu-x20.el,v 7.33 1996/07/15 08:29:22 morioka Exp $ ;;; Keywords: emulation, compatibility, Mule, XEmacs ;;; ;;; This file is part of tl (Tiny Library). @@ -128,11 +128,6 @@ in the region between START and END. ;;; )) -(defalias 'character-encode-string 'encode-coding-string) -(defalias 'character-decode-string 'decode-coding-string) -(defalias 'character-encode-region 'encode-coding-region) -(defalias 'character-decode-region 'decode-coding-region) - (defmacro as-binary-process (&rest body) `(let (selective-display ; Disable ^M to nl translation. process-input-coding-system @@ -192,20 +187,35 @@ in the region between START and END. (charsets-to-mime-charset (charsets-in-region start end))) (defun encode-mime-charset-region (start end charset) - "Encode the text between START and END which is -encoded in MIME CHARSET. [emu-x20.el]" + "Encode the text between START and END as MIME CHARSET. +\[emu-x20.el]" (let ((cs (mime-charset-to-coding-system charset))) (if cs (encode-coding-region start end cs) ))) +(defun decode-mime-charset-region (start end charset) + "Decode the text between START and END as MIME CHARSET. +\[emu-x20.el]" + (let ((cs (mime-charset-to-coding-system charset))) + (if cs + (decode-coding-region start end cs) + ))) + (defun encode-mime-charset-string (string charset) - "Encode the STRING which is encoded in MIME CHARSET. [emu-x20.el]" + "Encode the STRING as MIME CHARSET. [emu-x20.el]" (let ((cs (mime-charset-to-coding-system charset))) (if cs (encode-coding-string string cs) string))) +(defun decode-mime-charset-string (string charset) + "Decode the STRING as MIME CHARSET. [emu-x20.el]" + (let ((cs (mime-charset-to-coding-system charset))) + (if cs + (decode-coding-string string cs) + string))) + ;;; @ character ;;; -- 1.7.10.4