From 067be3be8ef68b03d694ef7ac60de078c4b7dc4d Mon Sep 17 00:00:00 2001
From: keiichi <keiichi>
Date: Wed, 4 Nov 1998 03:09:22 +0000
Subject: [PATCH] (message-mime-setup): New function. (format-alist): Append
 `mime-message' when loading. (message-mime-encode): New
 function. (message-setup-hook): Use `message-mime-setup'
 instead of `turn-on-mime-edit'. (message-save-drafts):
 Delete unused function. (message-save-buffer): Delete
 unused valiable. Use `format-alist' for saving message.
 Thank you for MORIOKA Tomohiko's suggestion.

---
 lisp/message.el |   43 +++++++++++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/lisp/message.el b/lisp/message.el
index e83afde..1d952e3 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -469,7 +469,7 @@ variable isn't used."
   :group 'message-headers
   :type 'boolean)
 
-(defcustom message-setup-hook '(turn-on-mime-edit)
+(defcustom message-setup-hook '(message-mime-setup)
   "Normal hook, run each time a new outgoing message is initialized.
 The function `message-setup' runs this hook."
   :group 'message-various
@@ -4435,6 +4435,32 @@ regexp varstr."
 (set-alist 'mime-edit-message-inserter-alist
 	   'message-mode (function message-mime-insert-article))
 
+(defun message-mime-encode (start end &optional orig-buf)
+  (save-restriction
+    (narrow-to-region start end)
+    (when (with-current-buffer orig-buf
+	    mime-edit-mode-flag)
+      (run-hooks 'mime-edit-translate-hook)
+      (mime-edit-translate-buffer)
+      )
+    (goto-char start)
+    (and (search-forward (concat "\n" mail-header-separator "\n") nil t)
+	 (replace-match "\n\n"))
+    ))
+
+(set-alist 'format-alist
+	   'mime-message
+	   `("MIME message."
+	     ,(concat "\\(" std11-field-name-regexp
+		      ":[^\n]*\\(\n[ \t][^\n]*\\)*\\)*\n\n")
+	     nil
+	     message-mime-encode
+	     t nil))
+
+(defun message-mime-setup ()
+  (turn-on-mime-edit)
+  (add-to-list 'buffer-file-format 'mime-message))
+
 ;;; Miscellaneous functions
 
 ;; stolen (and renamed) from nnheader.el
@@ -4450,21 +4476,6 @@ regexp varstr."
       (setq idx (1+ idx)))
     string))
 
-(defvar message-save-buffer " *encoding")
-(defun message-save-drafts ()
-  (interactive)
-  (if (not (get-buffer message-save-buffer))
-      (get-buffer-create message-save-buffer))
-  (let ((filename buffer-file-name)
-	(buffer (current-buffer)))
-    (set-buffer message-save-buffer)
-    (erase-buffer)
-    (insert-buffer buffer)
-    (mime-edit-translate-buffer)
-    (write-region (point-min) (point-max) filename)
-    (set-buffer buffer)
-    (set-buffer-modified-p nil)))
-
 (run-hooks 'message-load-hook)
 
 (provide 'message)
-- 
1.7.10.4