tm 5.13

[elisp/tm.git] / tiny-mime.el

diff --git a/tiny-mime.el b/tiny-mime.el
index 6093b37..a9b983f 100644 (file)
--- a/tiny-mime.el
+++ b/tiny-mime.el
@@ -21,7 +21,7 @@
 ;;; @ version
 ;;;
 (defconst mime/RCS-ID
-  "$Id: tiny-mime.el,v 5.1 1994/10/17 07:40:33 morioka Exp $")
+  "$Id: tiny-mime.el,v 5.3 1994/10/25 11:51:05 morioka Exp $")
 
 (defconst mime/tiny-mime-version (get-version-string mime/RCS-ID))
 
@@ -175,41 +175,39 @@
        field-name field-body)
     (setq field-name (car ret))
     (setq field-body (nth 1 ret))
-    (if (string= field-body "")
-       field-name
-      (concat field-name " "
-             (if (or (string-match "^Reply-To:$" field-name)
-                     (string-match "^From:$" field-name)
-                     (string-match "^Sender:$" field-name)
-                     (string-match "^Resent-Reply-To:$" field-name)
-                     (string-match "^Resent-From:$" field-name)
-                     (string-match "^Resent-Sender:$" field-name)
-                     (string-match "^To:$" field-name)
-                     (string-match "^Resent-To:$" field-name)
-                     (string-match "^cc:$" field-name)
-                     (string-match "^Resent-cc:$" field-name)
-                     (string-match "^bcc:$" field-name)
-                     (string-match "^Resent-bcc:$" field-name)
-                     )
-                 (mime/encode-address-list (+ (length field-name) 1)
-                                           field-body)
-               (catch 'label
-                 (let ((i 0)
-                       (n (length mime/no-encoding-header-fields))
-                       fn)
-                   (while (< i n)
-                     (setq fn (nth i mime/no-encoding-header-fields))
-                     (if (string-match (concat "^" fn ":$") field-name)
-                         (progn
-                           (throw 'label field-body)
-                           ))
-                     (setq i (+ i 1))
-                     )
-                   (nth 1 (mime/encode-header-string (+ (length field-name) 1)
-                                                     field-body))
-                   ))
-               ))
-      )))
+    (concat field-name " "
+           (cond ((string= field-body "") "")
+                 ((or (string-match "^Reply-To:$" field-name)
+                      (string-match "^From:$" field-name)
+                      (string-match "^Sender:$" field-name)
+                      (string-match "^Resent-Reply-To:$" field-name)
+                      (string-match "^Resent-From:$" field-name)
+                      (string-match "^Resent-Sender:$" field-name)
+                      (string-match "^To:$" field-name)
+                      (string-match "^Resent-To:$" field-name)
+                      (string-match "^cc:$" field-name)
+                      (string-match "^Resent-cc:$" field-name)
+                      (string-match "^bcc:$" field-name)
+                      (string-match "^Resent-bcc:$" field-name)
+                      )
+                  (mime/encode-address-list
+                   (+ (length field-name) 1) field-body)
+                  )
+                 (t
+                  (catch 'tag
+                    (let ((r mime/no-encoding-header-fields) fn)
+                      (while r
+                        (setq fn (car r))
+                        (if (string-match (concat "^" fn ":$") field-name)
+                            (throw 'tag field-body)
+                          )
+                        (setq r (cdr r))
+                        ))
+                    (nth 1 (mime/encode-header-string
+                            (+ (length field-name) 1) field-body))
+                    ))
+                 ))
+    ))
 
 (defun mime/encode-message-header ()
   (interactive "*")
@@ -662,7 +660,7 @@
 (defun mime/char-type (chr)
   (if (or (= chr 32)(= chr ?\t))
       LC-space
-    (mime/char-leading-char chr)
+    (get-lc chr)
     ))
 
 (defun mime/separate-string-by-chartype (string)