* eword-decode.el (eword-decode-header): code-conversion is now

effective again.

diff --git a/ChangeLog b/ChangeLog
index ee55210..91ffb8d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1998-04-21  Tanaka Akira  <akr@jaist.ac.jp>
+
+       * eword-decode.el (eword-decode-header): code-conversion is now
+       effective again.
+
 1998-04-21  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
        * eword-decode.el (eword-decode-quoted-encoded-word): Use

diff --git a/eword-decode.el b/eword-decode.el
index 1d55048..7b116f1 100644 (file)
--- a/eword-decode.el
+++ b/eword-decode.el
@@ -445,12 +445,12 @@ If SEPARATOR is not nil, it is used as header separator."
   (save-excursion
     (save-restriction
       (std11-narrow-to-header separator)
-      (let ((default-charset
+      (let ((default-mime-charset
              (if code-conversion
                  (if (mime-charset-to-coding-system code-conversion)
                      code-conversion
                    default-mime-charset))))
-       (if default-charset
+       (if default-mime-charset
            (let (beg p end field-name len)
              (goto-char (point-min))
              (while (re-search-forward std11-field-head-regexp nil t)
@@ -465,8 +465,7 @@ If SEPARATOR is not nil, it is used as header separator."
                       )
                      ((memq field-name eword-decode-structured-field-list)
                       ;; Decode as structured field
-                      (let ((body (buffer-substring p end))
-                            (default-mime-charset default-charset))
+                      (let ((body (buffer-substring p end)))
                         (delete-region p end)
                         (insert (eword-decode-and-fold-structured-field
                                  body (1+ len)))
@@ -476,8 +475,7 @@ If SEPARATOR is not nil, it is used as header separator."
                       (save-restriction
                         (narrow-to-region beg (1+ end))
                         (goto-char p)
-                        (let ((default-mime-charset default-charset))
-                          (eword-decode-region beg (point-max) 'unfold))
+                        (eword-decode-region beg (point-max) 'unfold)
                         (goto-char (point-max))
                         )))))
          (eword-decode-region (point-min) (point-max) t)