From: yoichi <yoichi>
Date: Sun, 24 Mar 2002 14:18:35 +0000 (+0000)
Subject: * wl-draft.el (wl-draft-trim-ccs): Renamed from
X-Git-Tag: elmo-mark-root~235
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=89d877d6adf12abf7a79a587cf57f0ba349ab3a6;p=elisp%2Fwanderlust.git

* wl-draft.el (wl-draft-trim-ccs): Renamed from
`wl-draft-insert-ccs' and return field value instead of inserting
the header. Abolish cc argument.
* wl-draft.el (wl-draft-default-headers): Use it for Bcc and Fcc.
---

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 2594703..76d26ec 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,5 +1,10 @@
 2002-03-24  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
 
+	* wl-draft.el (wl-draft-trim-ccs): Renamed from
+	`wl-draft-insert-ccs' and return field value instead of inserting
+	the header. Abolish cc argument.
+	* wl-draft.el (wl-draft-default-headers): Use it for Bcc and Fcc.
+
 	* wl-draft.el (wl-draft-default-headers): Use cons with symbol car
 	rather than one with string car.
 
diff --git a/wl/wl-draft.el b/wl/wl-draft.el
index 366a40a..6f81fd8 100644
--- a/wl/wl-draft.el
+++ b/wl/wl-draft.el
@@ -1655,7 +1655,7 @@ Derived from `message-save-drafts' in T-gnus."
   (if (not (= (preceding-char) ?\n))
       (insert ?\n)))
 
-(defsubst wl-draft-insert-ccs (str cc)
+(defsubst wl-draft-trim-ccs (cc)
   (let ((field
 	 (if (functionp cc)
 	     (funcall cc)
@@ -1668,7 +1668,8 @@ Derived from `message-save-drafts' in T-gnus."
 				  (wl-parse-addresses (std11-field-body "To"))
 				  (wl-parse-addresses (std11-field-body "Cc"))))
 			 (mapcar 'downcase wl-subscribed-mailing-list)))))
-	(insert str field "\n"))))
+	field
+      nil)))
 
 (defsubst wl-draft-default-headers ()
   (list
@@ -1677,11 +1678,13 @@ Derived from `message-save-drafts' in T-gnus."
 			      wl-from)))
    (cons "" wl-generate-mailer-string-function)
    (cons 'Reply-To mail-default-reply-to)
-   (cons 'wl-draft-insert-ccs
-	 (list "Bcc: " (or wl-bcc
-			   (and mail-self-blind (user-login-name)))))
-   (cons 'wl-draft-insert-ccs
-	 (list "Fcc: " wl-fcc))
+   (cons 'Bcc (function
+	       (lambda ()
+		 (wl-draft-trim-ccs
+		  (or wl-bcc (and mail-self-blind (user-login-name)))))))
+   (cons 'Fcc (function
+	       (lambda ()
+		 (wl-draft-trim-ccs wl-fcc))))
    (cons 'Organization wl-organization)
    (and wl-auto-insert-x-face
 	(file-exists-p wl-x-face-file)
@@ -1689,8 +1692,6 @@ Derived from `message-save-drafts' in T-gnus."
    mail-default-headers
    ;; check \n at th end of line for `mail-default-headers'
    'wl-draft-check-new-line
-;   wl-draft-default-headers
-;   'wl-draft-check-new-line
    ))
 
 (defun wl-draft-insert-mail-header-separator (&optional delimline)