* wl-draft.el (wl-draft-send-mail-with-smtp): run-hook

`wl-mail-send-pre-hook'.
(wl-draft-send-mail-with-qmail): Ditto.
(wl-draft-normal-send-func): Delete `wl-mail-send-pre-hook'.

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 1b7ae58..2fe8299 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,5 +1,12 @@
 2002-01-22  Kenichi OKADA  <okada@opaopa.org>
 
+       * wl-draft.el (wl-draft-send-mail-with-smtp): run-hook
+       `wl-mail-send-pre-hook'.
+       (wl-draft-send-mail-with-qmail): Ditto.
+       (wl-draft-normal-send-func): Delete `wl-mail-send-pre-hook'.
+
+2002-01-22  Kenichi OKADA  <okada@opaopa.org>
+
        * wl-message.el (wl-message-buffer-prefetch-subr):
        Fix for cancel-function-timers bug.
        (wl-message-buffer-prefetch-debug): Default value is t.

diff --git a/wl/wl-draft.el b/wl/wl-draft.el
index 8fcd881..1f81fc0 100644 (file)
--- a/wl/wl-draft.el
+++ b/wl/wl-draft.el
@@ -825,6 +825,7 @@ to find out how to use this."
           (not (elmo-plugged-p)))
       (wl-draft-set-sent-message 'mail 'unplugged)
     ;; send the message
+    (run-hooks 'wl-mail-send-pre-hook) ;; X-PGP-Sig, Cancel-Lock
     (let ((id (std11-field-body "Message-ID"))
          (to (std11-field-body "To")))
       (case
@@ -985,7 +986,7 @@ non-nil."
            (goto-char (1+ delimline))
            (if (eval mail-mailer-swallows-blank-line)
                (newline))
-;;;        (run-hooks 'wl-mail-send-pre-hook)
+           (run-hooks 'wl-mail-send-pre-hook) ;; X-PGP-Sig, Cancel-Lock
            (if mail-interactive
                (save-excursion
                  (set-buffer errbuf)
@@ -1071,7 +1072,7 @@ If FORCE-MSGID, ignore 'wl-insert-message-id'."
     ;; ignore any blank lines in the header
     (while (re-search-forward "\n\n\n*" nil t)
       (replace-match "\n")))
-  (run-hooks 'wl-mail-send-pre-hook) ;; X-PGP-Sig, Cancel-Lock
+;;;  (run-hooks 'wl-mail-send-pre-hook) ;; X-PGP-Sig, Cancel-Lock
   (wl-draft-dispatch-message)
   (when kill-when-done
     ;; hide editing-buffer.