* (mime-edit-use-long-mime-charset-comment): Use `defvar' to define.

* mime-edit.el (mime-edit-define-charset): Check
`mime-edit-use-long-mime-charset-comment'.

diff --git a/ChangeLog b/ChangeLog
index 07a33d0..7acf445 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+1999-05-02  Tanaka Akira  <akr@jaist.ac.jp>
+
+       * (mime-edit-use-long-mime-charset-comment): Use `defvar' to define.
+
+       * mime-edit.el (mime-edit-define-charset): Check
+       `mime-edit-use-long-mime-charset-comment'.
+
 1999-04-30 Shigeru OKUMURA <sokumura@jaist.ac.jp>
        
        * mime-edit.el (mime-edit-use-long-mime-charset-comment):

diff --git a/mime-edit.el b/mime-edit.el
index 0679340..3a5ec24 100644 (file)
--- a/mime-edit.el
+++ b/mime-edit.el
@@ -502,19 +502,12 @@ If encoding is nil, it is determined from its contents."
   "A string formatted version of mime-transfer-level")
 (make-variable-buffer-local 'mime-transfer-level-string)
 
-;;
-;; some MUA reject long comment
-;;
+(defvar mime-edit-use-long-mime-charset-comment t
+  "*Use charset comment")
 
-(if (and (boundp 'mime-edit-use-long-mime-charset-comment)
-        mime-edit-use-long-mime-charset-comment)
-    (progn
-      (put 'iso-2022-jp-2 'mime-charset-comment "RFC1554")
-      (put 'iso-2022-jp 'mime-charset-comment "RFC1468 with trivial bugfix")
-      )
-  )
+(put 'iso-2022-jp-2 'mime-charset-comment "RFC1554")
+(put 'iso-2022-jp 'mime-charset-comment "RFC1468 with trivial bugfix")
 
-  
 ;;; @@ about content transfer encoding
 
 (defvar mime-content-transfer-encoding-priority-list
@@ -1382,7 +1375,7 @@ Optional argument ENCODING specifies an encoding method such as base64."
             (mime-edit-get-contype tag)
             "charset"
             (let ((comment (get charset 'mime-charset-comment)))
-              (if comment
+              (if (and mime-edit-use-long-mime-charset-comment comment)
                   (concat (upcase (symbol-name charset)) " (" comment ")")
                 (upcase (symbol-name charset)))))
            (mime-edit-get-encoding tag)))