From: morioka <morioka>
Date: Mon, 19 Oct 1998 18:44:53 +0000 (+0000)
Subject: (insert-header): Include `:' in field-name.
X-Git-Tag: flim-1_11_1~11
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d90e91dd1dfc2dd486b767cec795b35f530e85a4;p=elisp%2Fflim.git

(insert-header): Include `:' in field-name.
---

diff --git a/mmgeneric.el b/mmgeneric.el
index 634c80a..e6062e9 100644
--- a/mmgeneric.el
+++ b/mmgeneric.el
@@ -151,7 +151,7 @@
     (let ((the-buf (current-buffer))
 	  (src-buf (mime-entity-buffer entity))
 	  (h-end (mime-entity-header-end-internal entity))
-	  beg p end field-name len field)
+	  beg p end field-name len field field-body)
       (save-excursion
 	(set-buffer src-buf)
 	(goto-char (mime-entity-header-start-internal entity))
@@ -160,38 +160,26 @@
 	  (while (re-search-forward std11-field-head-regexp nil t)
 	    (setq beg (match-beginning 0)
 		  p (match-end 0)
-		  field-name (buffer-substring beg (1- p))
+		  field-name (buffer-substring beg p)
 		  len (string-width field-name)
 		  end (std11-field-end))
 	    (when (mime-visible-field-p field-name
 					visible-fields invisible-fields)
-	      (setq field (intern (capitalize field-name)))
-	      (save-excursion
-		(set-buffer the-buf)
+	      (setq field (intern
+			   (capitalize (buffer-substring beg (1- p))))
+		    field-body (buffer-substring p end))
+	      (with-current-buffer the-buf
 		(insert field-name)
-		(insert ":")
-		(cond ((memq field eword-decode-ignored-field-list)
-		       ;; Don't decode
-		       (insert-buffer-substring src-buf p end)
-		       )
-		      ((memq field eword-decode-structured-field-list)
+		(insert
+		 (if (memq field eword-decode-ignored-field-list)
+		     ;; Don't decode
+		     field-body
+		   (if (memq field eword-decode-structured-field-list)
 		       ;; Decode as structured field
-		       (let ((body (save-excursion
-				     (set-buffer src-buf)
-				     (buffer-substring p end)
-				     )))
-			 (insert (eword-decode-and-fold-structured-field
-				  body (1+ len)))
-			 ))
-		      (t
-		       ;; Decode as unstructured field
-		       (let ((body (save-excursion
-				     (set-buffer src-buf)
-				     (buffer-substring p end)
-				     )))
-			 (insert (eword-decode-unstructured-field-body
-				  body (1+ len)))
-			 )))
+		       (eword-decode-and-fold-structured-field field-body len)
+		     ;; Decode as unstructured field
+		     (eword-decode-unstructured-field-body field-body len)
+		     )))
 		(insert "\n")
 		))))))))