From ae30a2bf57613817d3078288a959fcff1901f20c Mon Sep 17 00:00:00 2001
From: okada <okada>
Date: Wed, 26 Jul 2000 03:10:22 +0000
Subject: [PATCH] * wl-draft.el (wl-draft): Added argument
 `content-transfer-encoding'. (wl-draft-edit-string): Ditto.
 (wl-draft-forward): Ditto. * wl-summary.el
 (wl-summary-write): Ditto.

---
 wl/ChangeLog     |    7 +++++++
 wl/wl-draft.el   |   19 ++++++++++++-------
 wl/wl-summary.el |    2 +-
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/wl/ChangeLog b/wl/ChangeLog
index bb0e156..4ac0512 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,10 @@
+2000-07-26	Kenichi OKADA	<okada@opaopa.org>
+
+	* wl-draft.el (wl-draft): Added argument `content-transfer-encoding'.
+	(wl-draft-edit-string): Ditto.
+	(wl-draft-forward): Ditto.
+	* wl-summary.el (wl-summary-write): Ditto.
+
 2000-07-24  Yuuichi Teranishi  <teranisi@gohome.org>
 
 	* wl-summary.el (wl-summary-sync-update3): Call
diff --git a/wl/wl-draft.el b/wl/wl-draft.el
index a9f7cfd..e05a13d 100644
--- a/wl/wl-draft.el
+++ b/wl/wl-draft.el
@@ -264,7 +264,7 @@ the `wl-smtp-features' variable."
 
 (defun wl-draft-forward (original-subject summary-buf)
   (wl-draft "" (concat "Forward: " original-subject) 
-	    nil nil nil nil nil nil nil nil summary-buf)
+	    nil nil nil nil nil nil nil nil nil summary-buf)
   (goto-char (point-max))
   (wl-draft-insert-message)
   (mail-position-on-field "To"))
@@ -509,7 +509,7 @@ the `wl-smtp-features' variable."
   (let ((cur-buf (current-buffer))
 	(tmp-buf (get-buffer-create " *wl-draft-edit-string*"))
 	to subject in-reply-to cc references newsgroups mail-followup-to
-	content-type 
+	content-type content-transfer-encoding
 	body-beg buffer-read-only
 	)
     (set-buffer tmp-buf)
@@ -537,15 +537,16 @@ the `wl-smtp-features' variable."
     (setq references (std11-field-body "References"))
     (setq newsgroups (std11-field-body "Newsgroups"))
     (setq mail-followup-to (std11-field-body "Mail-Followup-To"))
-    (setq content-type  (std11-field-body "Content-Type"))
+    (setq content-type (std11-field-body "Content-Type"))
+    (setq content-transfer-encoding (std11-field-body "Content-Transfer-Encoding"))
     (goto-char (point-min))
     (or (re-search-forward "\n\n" nil t)
 	(search-forward (concat mail-header-separator "\n") nil t))
     (unwind-protect
-	(set-buffer
+	(set-buffer 
 	 (wl-draft to subject in-reply-to cc references newsgroups 
 		   mail-followup-to
-		   content-type
+		   content-type content-transfer-encoding
 		   (buffer-substring (point) (point-max))
 		   'edit-again
 		   ))
@@ -1199,7 +1200,7 @@ If optional argument is non-nil, current draft buffer is killed"
 ;;;###autoload
 (defun wl-draft (&optional to subject in-reply-to cc references newsgroups
 			   mail-followup-to
-			   content-type
+			   content-type content-transfer-encoding
 			   body edit-again summary-buf)
   "Write and send mail/news message with Wanderlust."
   (interactive)
@@ -1276,7 +1277,11 @@ If optional argument is non-nil, current draft buffer is killed"
 	(let (start)
 	  (setq start (point))
 	  (when content-type 
-	    (insert "Content-type: " content-type "\n\n"))
+	    (insert "Content-type: " content-type "\n"))
+	  (when content-transfer-encoding
+	    (insert "Content-Transfer-encoding: " content-transfer-encoding "\n"))
+	  (if (or content-type content-transfer-encoding)
+	      (insert "\n"))
 	  (and body (insert body))
 	  (save-restriction
 	    (narrow-to-region start (point))
diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index 7222261..a6cda40 100644
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -5199,7 +5199,7 @@ Reply to author if invoked with argument."
   "Write a new draft from Summary."
   (interactive)
   (wl-draft nil nil nil nil nil
-	    nil nil nil nil nil (current-buffer))
+	    nil nil nil nil nil nil (current-buffer))
   (run-hooks 'wl-mail-setup-hook)
   (mail-position-on-field "To"))
 
-- 
1.7.10.4