From 36688070f68fb82e6c0bb5aeca43dd1a14919311 Mon Sep 17 00:00:00 2001 From: teranisi Date: Wed, 13 Nov 2002 15:39:32 +0000 Subject: [PATCH] * wl-util.el (wl-biff-check-folder): Call elmo-pop3-get-session with argument 'any-exists. * elmo-pop3.el (elmo-pop3-get-session): If if-exists is 'any-exists, return normal pop3 session or pop3 biff session. --- elmo/ChangeLog | 5 +++++ elmo/elmo-pop3.el | 22 ++++++++++++++++------ wl/ChangeLog | 5 +++++ wl/wl-util.el | 2 +- 4 files changed, 27 insertions(+), 7 deletions(-) diff --git a/elmo/ChangeLog b/elmo/ChangeLog index 9b95789..e745911 100644 --- a/elmo/ChangeLog +++ b/elmo/ChangeLog @@ -1,3 +1,8 @@ +2002-11-13 Yuuichi Teranishi + + * elmo-pop3.el (elmo-pop3-get-session): If if-exists is 'any-exists, + return normal pop3 session or pop3 biff session. + 2002-11-08 Yuuichi Teranishi * elmo-maildir.el (elmo-maildir-update-current): Don't append diff --git a/elmo/elmo-pop3.el b/elmo/elmo-pop3.el index a9893b7..ae25a19 100644 --- a/elmo/elmo-pop3.el +++ b/elmo/elmo-pop3.el @@ -161,16 +161,26 @@ Debug information is inserted in the buffer \"*POP3 DEBUG*\"") (delete-process (elmo-network-session-process-internal session)))) (defun elmo-pop3-get-session (folder &optional if-exists) + "Get POP3 session for FOLDER. +If IF-EXISTS is non-nil, don't get new session. +If IF-EXISTS is `any-exists', get BIFF session or normal session if exists." (let ((elmo-pop3-use-uidl-internal (if elmo-inhibit-number-mapping nil (elmo-pop3-folder-use-uidl-internal folder)))) - (elmo-network-get-session 'elmo-pop3-session - (concat - (if (elmo-folder-biff-internal folder) - "BIFF-") - "POP3") - folder if-exists))) + (if (eq if-exists 'any-exists) + (or (elmo-network-get-session 'elmo-pop3-session + "POP3" + folder if-exists) + (elmo-network-get-session 'elmo-pop3-session + "BIFF-POP3" + folder if-exists)) + (elmo-network-get-session 'elmo-pop3-session + (concat + (if (elmo-folder-biff-internal folder) + "BIFF-") + "POP3") + folder if-exists)))) (defun elmo-pop3-send-command (process command &optional no-erase no-log) (with-current-buffer (process-buffer process) diff --git a/wl/ChangeLog b/wl/ChangeLog index 116f7a7..58818da 100644 --- a/wl/ChangeLog +++ b/wl/ChangeLog @@ -1,3 +1,8 @@ +2002-11-13 Yuuichi Teranishi + + * wl-util.el (wl-biff-check-folder): Call elmo-pop3-get-session + with argument 'any-exists. + 2002-11-13 Yoichi NAKAYAMA * wl-mime.el (wl-message-decrypt-pgp-nonmime): Fix the last change. diff --git a/wl/wl-util.el b/wl/wl-util.el index 1768a67..30f0740 100644 --- a/wl/wl-util.el +++ b/wl/wl-util.el @@ -846,7 +846,7 @@ This function is imported from Emacs 20.7." (defun wl-biff-check-folder (folder) (if (eq (elmo-folder-type-internal folder) 'pop3) - (unless (elmo-pop3-get-session folder 'if-exists) + (unless (elmo-pop3-get-session folder 'any-exists) (wl-folder-check-one-entity (elmo-folder-name-internal folder) 'biff)) (wl-folder-check-one-entity (elmo-folder-name-internal folder) -- 1.7.10.4