X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=eword-encode.el;h=9f2ce4da195331ec2f82149ab279354a63704b2d;hb=372361a4c3bd6c5cfd83aafb663f21f67f52aa15;hp=e95b458cecbbde089078b9146185b1bbceed37ce;hpb=b6bac758093ad4b479bd15b16ecb5c335cadbda3;p=elisp%2Fflim.git

diff --git a/eword-encode.el b/eword-encode.el
index e95b458..9f2ce4d 100644
--- a/eword-encode.el
+++ b/eword-encode.el
@@ -46,6 +46,7 @@
     (iso-8859-7		. "Q")
     (iso-8859-8		. "Q")
     (iso-8859-9		. "Q")
+    (iso-8859-15	. "Q")
     (iso-2022-jp	. "B")
     (iso-2022-jp-3	. "B")
     (iso-2022-kr	. "B")
@@ -687,16 +688,18 @@ It refer variable `mime-field-encoding-method-alist'."
       (goto-char (point-min))
       (let ((default-cs (mime-charset-to-coding-system default-mime-charset))
 	    bbeg end field-name)
-	(while (re-search-forward std11-field-head-regexp nil t)
+	(while (re-search-forward
+		(concat "\\(" std11-field-head-regexp "\\)" " ?")
+		nil t)
 	  (setq bbeg (match-end 0)
-		field-name (buffer-substring (match-beginning 0) (1- bbeg))
+		field-name (buffer-substring (match-beginning 0) (1- (match-end 1)))
 		end (std11-field-end))
 	  (and (delq 'ascii (find-charset-region bbeg end))
 	       (let ((method (eword-find-field-encoding-method
 			      (downcase field-name))))
 		 (cond ((eq method 'mime)
 			(let* ((field-body
-			       (buffer-substring-no-properties bbeg end))
+				(buffer-substring-no-properties bbeg end))
 			       (encoded-body
 				(mime-encode-field-body
 				 field-body field-name)))