X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=tm-orig.el;fp=tm-orig.el;h=762e462e3fc40c539224a603052006c112b97fb9;hb=83545c0017fdbc9bf61032c5d5e80a7555483fbe;hp=d5aa4d9eba0649b4dcbb8da65671c46f68bbc725;hpb=a2830b103396ae7af01c96e33f5b4f5df71a7b0a;p=elisp%2Ftm.git diff --git a/tm-orig.el b/tm-orig.el index d5aa4d9..762e462 100644 --- a/tm-orig.el +++ b/tm-orig.el @@ -1,5 +1,5 @@ ;;; -;;; $Id: tm-orig.el,v 6.1 1995/08/26 18:46:27 morioka Exp $ +;;; $Id: tm-orig.el,v 6.3 1995/08/27 14:26:18 morioka Exp $ ;;; (require 'emu) @@ -11,13 +11,11 @@ (defvar mime/default-coding-system nil) (defvar mime/lc-charset-and-encoding-alist - (list - (cons lc-ascii nil) - (cons lc-ltn1 '("ISO-8859-1" . "Q")) - )) + (list (cons lc-ascii nil) + (cons lc-ltn1 '("ISO-8859-1" . "Q")) + )) -(defvar mime/latin-lc-list - (list lc-ascii lc-ltn1)) +(defvar mime/latin-lc-list (list lc-ascii lc-ltn1)) (defvar mime/decoding-charset-list '("US-ASCII" "ISO-8859-1")) @@ -25,30 +23,15 @@ ;;; @ functions ;;; -;; by mol. 1993/10/4 (defun mime/convert-string-to-emacs (charset str) - (cond ((string-match "^US-ASCII$" charset) str) - ((string-match "^ISO-8859-1$" charset) str) - )) - -;; by mol. 1993/11/2 -(defun mime/convert-string-from-emacs (string charset) - (cond ((equal charset "US-ASCII") string) - ((equal charset "ISO-8859-1") string) - )) - -(defun mime/decode-encoded-text (charset encoding str) - (if (member charset mime/decoding-charset-list) - (cond ((string-match "^B$" encoding) - (mime/base64-decode-string str)) - ((string-match "^Q$" encoding) - (mime/Quoted-Printable-decode-string str)) - (t (message "unknown encoding %s" encoding) - (concat "=?" charset "?" encoding "?" str "?=") - )) - (concat "=?" charset "?" encoding "?" str "?=") - )) - + (if (or (string= "US-ASCII" charset) + (string= "ISO-8859-1" charset)) + str)) + +(defun mime/convert-string-from-emacs (str charset) + (if (or (string= charset "US-ASCII") + (string= charset "ISO-8859-1")) + str)) (defun mime/code-convert-region-to-emacs (beg end charset &optional encoding) )