From 79f799a52c8a4e7701310d57aefb90b3b1a18469 Mon Sep 17 00:00:00 2001
From: teranisi <teranisi>
Date: Tue, 6 Feb 2001 02:58:04 +0000
Subject: [PATCH] * wl-mime.el (wl-draft-preview-message):  Run
 `wl-draft-send-hook' before collecting recipients
 information;  Bind `wl-draft-config-exec-flag' while
 running `wl-draft-send-hook'.

* tm-wl.el (wl-draft-preview-message): Ditto.
---
 wl/ChangeLog  |    8 ++++++++
 wl/tm-wl.el   |   47 +++++++++++++++++++++++++----------------------
 wl/wl-mime.el |   37 ++++++++++++++++++++-----------------
 3 files changed, 53 insertions(+), 39 deletions(-)

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 41d66d7..fbe8512 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,11 @@
+2001-02-06  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* wl-mime.el (wl-draft-preview-message):
+	Run `wl-draft-send-hook' before collecting recipients information;
+	Bind `wl-draft-config-exec-flag' while running `wl-draft-send-hook'.
+
+	* tm-wl.el (wl-draft-preview-message): Ditto.
+
 2001-02-05  Yuuichi Teranishi  <teranisi@gohome.org>
 
 	* wl-mime.el (wl-draft-preview-message): Fixed problem that
diff --git a/wl/tm-wl.el b/wl/tm-wl.el
index 47dd24d..cfbc754 100644
--- a/wl/tm-wl.el
+++ b/wl/tm-wl.el
@@ -63,33 +63,36 @@ By setting following-method as yank-content."
 (defun wl-draft-preview-message ()
   (interactive)
   (let* (recipients-message
+	 (config-exec-flag wl-draft-config-exec-flag)
 	 (mime-viewer/content-header-filter-hook 'wl-highlight-headers)
 	 (mime-viewer/ignored-field-regexp "^:$")
 	 (mime-editor/translate-buffer-hook
-	  '((lambda ()
-	      (setq recipients-message
-		    (concat "Recipients: "
-			    (mapconcat
-			     'identity
-			     (wl-draft-deduce-address-list
-			      (current-buffer)
-			      (point-min)
-			      (save-excursion
-				(re-search-forward
-				 (concat "^"
-					 (regexp-quote mail-header-separator)
-					 "$")
-				 nil t)
-				(point)))
-			     ", ")))
-	      (run-hooks 'wl-draft-send-hook)))
-	  mime-editor/translate-buffer-hook))
+	  (append
+	   '((lambda ()
+	       (let ((wl-draft-config-exec-flag config-exec-flag))
+		 (run-hooks 'wl-draft-send-hook)
+		 (setq recipients-message
+		       (concat "Recipients: "
+			       (mapconcat
+				'identity
+				(wl-draft-deduce-address-list
+				 (current-buffer)
+				 (point-min)
+				 (save-excursion
+				   (goto-char (point-min))
+				   (re-search-forward
+				    (concat "^"
+					    (regexp-quote mail-header-separator)
+					    "$")
+				    nil t)
+				   (point)))
+				", "))))))
+	   mime-editor/translate-buffer-hook)))
     (mime-editor/preview-message)
     (let ((buffer-read-only nil))
-      (let ((buffer-read-only nil))
-	(when wl-highlight-body-too
-	  (wl-highlight-body))
-	(run-hooks 'wl-draft-preview-message-hook)))
+      (when wl-highlight-body-too
+	(wl-highlight-body))
+      (run-hooks 'wl-draft-preview-message-hook))
     (message recipients-message)))
 
 (defmacro wl-draft-caesar-region (beg end)
diff --git a/wl/wl-mime.el b/wl/wl-mime.el
index 6eee49d..833954a 100644
--- a/wl/wl-mime.el
+++ b/wl/wl-mime.el
@@ -72,28 +72,31 @@ By setting following-method as yank-content."
   ""
   (interactive)
   (let* (recipients-message
+	 (config-exec-flag wl-draft-config-exec-flag)
 	 (mime-display-header-hook 'wl-highlight-headers)
 	 mime-view-ignored-field-list ; all header.
 	 (mime-edit-translate-buffer-hook
 	  (append
 	   '((lambda ()
-	       (setq recipients-message
-		     (concat "Recipients: "
-			     (mapconcat
-			      'identity
-			      (wl-draft-deduce-address-list
-			       (current-buffer)
-			       (point-min)
-			       (save-excursion
-				 (goto-char (point-min))
-				 (re-search-forward
-				  (concat "^"
-					  (regexp-quote mail-header-separator)
-					  "$")
-				  nil t)
-				 (point)))
-			      ", ")))
-	       (run-hooks 'wl-draft-send-hook)))
+	       (let ((wl-draft-config-exec-flag config-exec-flag))
+		 (run-hooks 'wl-draft-send-hook)
+		 (setq recipients-message
+		       (concat "Recipients: "
+			       (mapconcat
+				'identity
+				(wl-draft-deduce-address-list
+				 (current-buffer)
+				 (point-min)
+				 (save-excursion
+				   (goto-char (point-min))
+				   (re-search-forward
+				    (concat
+				     "^"
+				     (regexp-quote mail-header-separator)
+				     "$")
+				    nil t)
+				   (point)))
+				", "))))))
 	   mime-edit-translate-buffer-hook)))
     (mime-edit-preview-message)
     (let ((buffer-read-only nil))
-- 
1.7.10.4