* wl-folder.el (wl-make-plugged-alist): Add `wl-smtp-posting-port'.

	Fix about the order of `wl-nntp-posting-port' and
	`wl-nntp-posting-stream-type'.
	* wl.el (wl-plugged-port-label-alist): Add smtp.

diff --git a/wl/ChangeLog b/wl/ChangeLog
index ebb31ec..e60273c 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,10 @@
+2006-04-20  Kenichi Okada  <okada@opaopa.org>
+
+       * wl-folder.el (wl-make-plugged-alist): Add `wl-smtp-posting-port'.
+       Fix about the order of `wl-nntp-posting-port' and
+       `wl-nntp-posting-stream-type'.
+       * wl.el (wl-plugged-port-label-alist): Add smtp.
+
 2006-02-26  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
        * wl-summary.el (wl-summary-message-status): New macro.

diff --git a/wl/wl-folder.el b/wl/wl-folder.el
index 676ae9b..4e1be53 100644 (file)
--- a/wl/wl-folder.el
+++ b/wl/wl-folder.el
@@ -2071,7 +2071,8 @@ Entering Folder mode calls the value of `wl-folder-mode-hook'."
     (when wl-smtp-posting-server
       (elmo-set-plugged wl-plugged
                        wl-smtp-posting-server  ; server
-                       (or (and (boundp 'smtp-service) smtp-service)
+                       (or wl-smtp-posting-port
+                           (and (boundp 'smtp-service) smtp-service)
                            "smtp")     ; port
                        wl-smtp-connection-type
                        nil nil "smtp" add))
@@ -2079,8 +2080,8 @@ Entering Folder mode calls the value of `wl-folder-mode-hook'."
     (when wl-nntp-posting-server
       (elmo-set-plugged wl-plugged
                        wl-nntp-posting-server
-                       wl-nntp-posting-stream-type
                        wl-nntp-posting-port
+                       wl-nntp-posting-stream-type
                        nil nil "nntp" add))
     (run-hooks 'wl-make-plugged-hook)))
 

diff --git a/wl/wl.el b/wl/wl.el
index 4770120..0f9bc2f 100644 (file)
--- a/wl/wl.el
+++ b/wl/wl.el
@@ -137,7 +137,8 @@
 (defvar wl-plugged-port-label-alist
   (list (cons 119 "nntp")
        (cons 143 "imap4")
-       (cons 110 "pop3")))
+       (cons 110 "pop3")
+       (cons 25 "smtp")))
        ;;(cons elmo-pop-before-smtp-port "pop3")
 
 (defconst wl-plugged-switch-variables