From dd6cdbc47aea23a1ce7d13fa4fab3f3f415276f5 Mon Sep 17 00:00:00 2001 From: okazaki Date: Sat, 30 Dec 2000 05:15:38 +0000 Subject: [PATCH] Merge 1.15.2.2 and 1.15.2.3 from wl-2_4 branch. 2000-12-12 KOGURO Naoki * wl-draft.el (wl-draft-send-mail-with-pop-before-smtp): Close POP connection before call `wl-draft-send-mail-with-smtp'. --- wl/wl-draft.el | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/wl/wl-draft.el b/wl/wl-draft.el index 8e32b6b..6135e76 100644 --- a/wl/wl-draft.el +++ b/wl/wl-draft.el @@ -972,18 +972,19 @@ non-nil." "Send the prepared message buffer with POP-before-SMTP." (require 'elmo-pop3) (condition-case () - (elmo-pop3-get-session - (list 'pop3 - (or wl-pop-before-smtp-user - elmo-default-pop3-user) - (or wl-pop-before-smtp-authenticate-type - elmo-default-pop3-authenticate-type) - (or wl-pop-before-smtp-server - elmo-default-pop3-server) - (or wl-pop-before-smtp-port - elmo-default-pop3-port) - (or wl-pop-before-smtp-stream-type - elmo-default-pop3-stream-type))) + (let ((session (elmo-pop3-get-session + (list 'pop3 + (or wl-pop-before-smtp-user + elmo-default-pop3-user) + (or wl-pop-before-smtp-authenticate-type + elmo-default-pop3-authenticate-type) + (or wl-pop-before-smtp-server + elmo-default-pop3-server) + (or wl-pop-before-smtp-port + elmo-default-pop3-port) + (or wl-pop-before-smtp-stream-type + elmo-default-pop3-stream-type))))) + (when session (elmo-network-close-session session))) (error)) (wl-draft-send-mail-with-smtp)) -- 1.7.10.4