Sync with semi-1_14_0.

diff --git a/mime/mime-edit.el b/mime/mime-edit.el
index 9e6d449..37963cb 100644 (file)
--- a/mime/mime-edit.el
+++ b/mime/mime-edit.el
@@ -110,7 +110,6 @@
 (require 'sendmail)
 (require 'mail-utils)
 (require 'mel)
-(require 'eword-encode) ; eword-encode-field-body
 (require 'mime-view)
 (require 'signature)
 (require 'alist)
@@ -716,7 +715,7 @@ Tspecials means any character that matches with it in header must be quoted.")
 
 (defconst mime-edit-mime-version-field-for-message/partial
   (concat "MIME-Version:"
-         (eword-encode-field-body
+         (mime-encode-field-body
           (concat " 1.0 (split by " mime-edit-version ")\n")
           "MIME-Version:"))
   "MIME version field for message/partial.")
@@ -1653,9 +1652,8 @@ Parameter must be '(PROMPT CHOICE1 (CHOISE2 ...))."
 
 (defun mime-edit-translate-header ()
   "Encode the message header into network representation."
-  (eword-encode-header 'code-conversion)
-  (run-hooks 'mime-edit-translate-header-hook)
-  )
+  (mime-encode-header-in-buffer 'code-conversion)
+  (run-hooks 'mime-edit-translate-header-hook))
 
 (defun mime-edit-translate-buffer ()
   "Encode the tagged MIME message in current buffer in MIME compliant message."
@@ -1879,7 +1877,7 @@ Content-Transfer-Encoding: 7bit
               (insert (format "Content-Transfer-Encoding: %s\n" encoding))
             )
           (insert "\n")
-         (eword-encode-header)
+         (mime-encode-header-in-buffer)
          (or (let ((pgg-default-user-id 
                     (or mime-edit-pgp-user-id
                         (if from 
@@ -2127,8 +2125,7 @@ Content-Description: S/MIME Encrypted Message][base64]]\n")
            (insert "Content-Type: " contype "\n")
            (if encoding
                (insert "Content-Transfer-Encoding: " encoding "\n"))
-           (eword-encode-header)
-           )
+           (mime-encode-header-in-buffer))
          (cons (and contype
                     (downcase contype))
                (and encoding