From: morioka <morioka>
Date: Thu, 11 Jun 1998 07:25:37 +0000 (+0000)
Subject: (mime-charset-type-list): Use base64 for `cn-gb2312' and `gb2312';
X-Git-Tag: remi-1_6_0~18
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=0efc11355232ea32bfd7534cf514e93e9d535c5c;p=elisp%2Fsemi.git

(mime-charset-type-list): Use base64 for `cn-gb2312' and `gb2312';
delete `x-ctext'.
(mime-edit-normalize-body): If encoding is not specified for charset,
use "quoted-printable" or "8bit" for mime-transfer-level is 7 or 8.
---

diff --git a/mime-edit.el b/mime-edit.el
index ac62839..8660ccc 100644
--- a/mime-edit.el
+++ b/mime-edit.el
@@ -441,14 +441,13 @@ If encoding is nil, it is determined from its contents."
     (iso-2022-jp	7 "base64")
     (iso-2022-kr	7 "base64")
     (euc-kr		8 "base64")
-    (cn-gb2312		8 "quoted-printable")
+    (cn-gb2312		8 "base64")
+    (gb2312		8 "base64")
     (cn-big5		8 "base64")
-    (gb2312		8 "quoted-printable")
     (big5		8 "base64")
+    (shift_jis		8 "base64")
     (iso-2022-jp-2	7 "base64")
     (iso-2022-int-1	7 "base64")
-    (shift_jis		8 "base64")
-    (x-ctext		8 "quoted-printable")
     ))
 
 (defvar mime-transfer-level 7
@@ -2045,12 +2044,12 @@ Content-Transfer-Encoding: 7bit
 	;; Define encoding and encode text if necessary.
 	(or encoding	;Encoding is not specified.
 	    (let* ((encoding
-		    (cdr
-		     (assq charset
-			   mime-edit-charset-default-encoding-alist)
-		     ))
-		   (beg (mime-edit-content-beginning))
-		   )
+		    (or (cdr (assq charset
+				   mime-edit-charset-default-encoding-alist))
+			(if (< mime-transfer-level 8)
+			    "quoted-printable"
+			  "8bit")))
+		   (beg (mime-edit-content-beginning)))
 	      (encode-mime-charset-region beg (mime-edit-content-end)
 					  charset)
 	      ;; Protect "From " in beginning of line