Merge JR-Himi.

[elisp/semi.git] / eword-encode.el

diff --git a/eword-encode.el b/eword-encode.el
index 7025eba..ee3f95c 100644 (file)
--- a/eword-encode.el
+++ b/eword-encode.el
@@ -1,12 +1,11 @@
 ;;; eword-encode.el --- RFC 2047 based encoded-word encoder for GNU Emacs
 
-;; Copyright (C) 1995,1996,1997 Free Software Foundation, Inc.
+;; Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;; Version: $Revision: 0.31 $
 ;; Keywords: encoded-word, MIME, multilingual, header, mail, news
 
-;; This file is part of SEMI (SEMI is Emacs MIME Interfaces).
+;; This file is part of SEMI (Spadework for Emacs MIME Interfaces).
 
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License as
@@ -36,7 +35,7 @@
 ;;;
 
 (defconst eword-encode-RCS-ID
-  "$Id: eword-encode.el,v 0.31 1997-09-25 12:58:09 morioka Exp $")
+  "$Id: eword-encode.el,v 1.2 1998-03-13 12:55:54 morioka Exp $")
 (defconst eword-encode-version (get-version-string eword-encode-RCS-ID))
 
 
@@ -63,10 +62,6 @@ network-code.
 
 If method is nil, this field will not be encoded.")
 
-(defvar eword-generate-X-Nsubject nil
-  "*If it is not nil, X-Nsubject field is generated
-when Subject field is encoded by `eword-encode-header'.")
-
 (defvar eword-charset-encoding-alist
   '((us-ascii          . nil)
     (iso-8859-1                . "Q")
@@ -563,7 +558,8 @@ encoded-word.  ASCII token is not encoded."
                                       resent-reply-to resent-from
                                       resent-sender to resent-to
                                       cc resent-cc
-                                      bcc resent-bcc dcc)
+                                      bcc resent-bcc dcc
+                                      mime-version)
                                     )
                               (car (tm-eword::encode-address-list
                                     (+ (length field-name) 2) field-body))
@@ -633,30 +629,6 @@ It refer variable `eword-field-encoding-method-alist'."
                          )))
                 ))
          ))
-      (and eword-generate-X-Nsubject
-          (or (std11-field-body "X-Nsubject")
-              (let ((str (eword-in-subject-p)))
-                (if str
-                    (progn
-                      (setq str
-                            (eword-decode-string
-                             (std11-unfold-string str)))
-                      (if code-conversion
-                          (setq str
-                                (encode-mime-charset-string
-                                 str
-                                 (or (cdr (assoc-if
-                                           (function
-                                            (lambda (str)
-                                              (and (stringp str)
-                                                   (string= "x-nsubject"
-                                                            (downcase str))
-                                                   )))
-                                           eword-field-encoding-method-alist))
-                                     'iso-2022-jp-2)))
-                        )
-                      (insert (concat "\nX-Nsubject: " str))
-                      )))))
       )))
 
 (defun eword-encode-string (str &optional column mode)