Synch to flim-1_14.

diff --git a/ChangeLog b/ChangeLog
index 7ea212a..ac837ab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-02-05  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
+
+       * eword-encode.el (mime-encode-header-in-buffer):
+       Do not eliminate white spaces.
+
+\f
 2002-12-27  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
        * FLIM: Version 1.14.5 (Demachiyanagi) released.

diff --git a/eword-encode.el b/eword-encode.el
index e8707b4..30700fd 100644 (file)
--- a/eword-encode.el
+++ b/eword-encode.el
@@ -649,26 +649,26 @@ 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 variable `mime-field-encoding-method-alist'."
   (interactive "*")
   (save-excursion
     (save-restriction
       (std11-narrow-to-header mail-header-separator)
       (goto-char (point-min))
       (let ((default-cs (mime-charset-to-coding-system default-mime-charset))
+           (regexp (concat "\\(" std11-field-head-regexp "\\)" " ?"))
            bbeg end field-name)
-       (while (re-search-forward std11-field-head-regexp nil t)
+       (while (re-search-forward 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)))
                          (delete-region bbeg end)
                          (insert (mime-encode-field-body field-body
                                                          field-name))))
@@ -677,11 +677,8 @@ 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)