(eword-decode-header): New implementation; add new argument

`CODE-CONVERSION' as first argument.  Change `SEPARATOR' as second
argument.

diff --git a/eword-decode.el b/eword-decode.el
index c2c743b..9499c5b 100644 (file)
--- a/eword-decode.el
+++ b/eword-decode.el
@@ -10,7 +10,7 @@
 ;;     Renamed: 1993/06/03 to tiny-mime.el
 ;;     Renamed: 1995/10/03 from tiny-mime.el (split off encoder)
 ;;     Renamed: 1997/02/22 from tm-ew-d.el
-;; Version: $Revision: 0.20 $
+;; Version: $Revision: 1.1 $
 ;; Keywords: encoded-word, MIME, multilingual, header, mail, news
 
 ;; This file is part of SEMI (SEMI is Emacs MIME Interfaces).
@@ -41,7 +41,7 @@
 ;;;
 
 (defconst eword-decode-RCS-ID
-  "$Id: eword-decode.el,v 0.20 1998-01-11 03:07:16 morioka Exp $")
+  "$Id: eword-decode.el,v 1.1 1998-02-16 18:44:37 morioka Exp $")
 (defconst eword-decode-version (get-version-string eword-decode-RCS-ID))
 
 
@@ -180,15 +180,53 @@ such as a version of Net$cape)."
 ;;; @ for message header
 ;;;
 
-(defun eword-decode-header (&optional separator)
+(defun eword-decode-header (&optional code-conversion separator)
   "Decode MIME encoded-words in header fields.
+If CODE-CONVERSION is nil, it decodes only encoded-words.  If it is
+mime-charset, it decodes non-ASCII bit patterns as the mime-charset.
+Otherwise it decodes non-ASCII bit patterns as the
+default-mime-charset.
 If SEPARATOR is not nil, it is used as header separator."
   (interactive "*")
   (save-excursion
     (save-restriction
       (std11-narrow-to-header separator)
-      (eword-decode-region (point-min) (point-max) t)
-      )))
+      (let ((default-charset
+             (if code-conversion
+                 (if (mime-charset-to-coding-system code-conversion)
+                     code-conversion
+                   default-mime-charset))))
+       (if default-charset
+           (let (beg end field-name)
+             (goto-char (point-min))
+             (while (re-search-forward std11-field-head-regexp nil t)
+               (setq beg (match-beginning 0)
+                     p (match-end 0)
+                     field-name (intern
+                                 (downcase (buffer-substring beg (1- p))))
+                     end (std11-field-end))
+               (cond ((memq field-name '(newsgroups message-id path))
+                      )
+                     ((memq field-name '(reply-to
+                                         from sender
+                                         resent-reply-to resent-from
+                                         resent-sender to resent-to
+                                         cc resent-cc
+                                         bcc resent-bcc dcc
+                                         mime-version))
+                      (let ((body (buffer-substring p end))
+                            (default-mime-charset default-charset))
+                        (delete-region p end)
+                        (insert (eword-decode-structured-field-body body))
+                        ))
+                     (t
+                      (let ((body (buffer-substring p end))
+                            (default-mime-charset default-charset))
+                        (delete-region p end)
+                        (insert (eword-decode-unstructured-field-body body))
+                        )))))
+         (eword-decode-region (point-min) (point-max) t)
+         )))))
 
 (defun eword-decode-unfold ()
   (goto-char (point-min))