From 58fdf5c3732b40b25c96b4035fd40819b29724ee Mon Sep 17 00:00:00 2001 From: yoichi Date: Sat, 17 Apr 2004 15:49:05 +0000 Subject: [PATCH] * wl-draft.el (wl-draft-send-mail-with-pop-before-smtp): Fix value of stream-type and session. --- wl/ChangeLog | 5 +++++ wl/wl-draft.el | 13 +++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/wl/ChangeLog b/wl/ChangeLog index 976ceee..1ba2d88 100644 --- a/wl/ChangeLog +++ b/wl/ChangeLog @@ -1,3 +1,8 @@ +2004-04-17 Yoichi NAKAYAMA + + * wl-draft.el (wl-draft-send-mail-with-pop-before-smtp): Fix + value of stream-type and session. + 2004-04-16 Hiroya Murata * Version number is increased to 2.11.25. diff --git a/wl/wl-draft.el b/wl/wl-draft.el index dc85df3..52c3732 100644 --- a/wl/wl-draft.el +++ b/wl/wl-draft.el @@ -1115,7 +1115,7 @@ non-nil." (defun wl-draft-send-mail-with-pop-before-smtp () "Send the prepared message buffer with POP-before-SMTP." (require 'elmo-pop3) - (let ((session + (let ((folder (luna-make-entity 'elmo-pop3-folder :user (or wl-pop-before-smtp-user @@ -1126,16 +1126,17 @@ non-nil." elmo-pop3-default-port) :auth (or wl-pop-before-smtp-authenticate-type elmo-pop3-default-authenticate-type) - :stream-type (or wl-pop-before-smtp-stream-type - elmo-pop3-default-stream-type)))) + :stream-type (elmo-get-network-stream-type + (or wl-pop-before-smtp-stream-type + elmo-pop3-default-stream-type)))) + session) (condition-case error (progn - (elmo-pop3-get-session session) + (setq session (elmo-pop3-get-session folder)) (when session (elmo-network-close-session session))) (error - (elmo-network-close-session session) (unless (string= (nth 1 error) "Unplugged") - (signal (car error)(cdr error)))))) + (signal (car error) (cdr error)))))) (wl-draft-send-mail-with-smtp)) (defun wl-draft-insert-required-fields (&optional force-msgid) -- 1.7.10.4