Synch to flim-1_14.

diff --git a/ChangeLog b/ChangeLog
index ec0420b..0cdf987 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-05-10  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * eword-encode.el (mime-encode-header-in-buffer): Don't ignore a
+       space char at the beginning of a field body in order to honor the
+       76-column rule which is described in RFC 2047 section 2.
+
 2004-04-15  MORIOKA Tomohiko  <tomo@m17n.org>
 
        * eword-decode.el (eword-decode-encoded-text): Fix bug when

diff --git a/eword-encode.el b/eword-encode.el
index 4621f20..63e4a8c 100644 (file)
--- a/eword-encode.el
+++ b/eword-encode.el
@@ -659,8 +659,7 @@ encoded-word.  ASCII token is not encoded."
 ;;;###autoload
 (defun mime-encode-header-in-buffer (&optional code-conversion)
   "Encode header fields to network representation, such as MIME encoded-word.
-
-It refer variable `mime-field-encoding-method-alist'."
+It refers the `mime-field-encoding-method-alist' variable."
   (interactive "*")
   (save-excursion
     (save-restriction
@@ -668,11 +667,10 @@ 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
-               (concat "\\(" std11-field-head-regexp "\\)" " ?")
-               nil t)
+       (while (re-search-forward std11-field-head-regexp nil t)
          (setq bbeg (match-end 0)
-               field-name (buffer-substring-no-properties (match-beginning 0) (1- (match-end 1)))
+               field-name (buffer-substring-no-properties (match-beginning 0)
+                                                          (1- bbeg))
                end (std11-field-end))
          (and (delq 'ascii (find-charset-region bbeg end))
               (let ((method (eword-find-field-encoding-method
@@ -693,11 +691,7 @@ It refer variable `mime-field-encoding-method-alist'."
                               (or (mime-charset-to-coding-system
                                    method)
                                   default-cs)))
-                         (encode-coding-region bbeg end cs)
-                         )))
-                ))
-         ))
-      )))
+                         (encode-coding-region bbeg end cs)))))))))))
 (defalias 'eword-encode-header 'mime-encode-header-in-buffer)
 (make-obsolete 'eword-encode-header 'mime-encode-header-in-buffer)