* elmo-nntp.el (elmo-nntp-post): Fix for `elmo-nntp-default-stream-type'

[elisp/wanderlust.git] / elmo / elmo-nntp.el

diff --git a/elmo/elmo-nntp.el b/elmo/elmo-nntp.el
index cf3c2c4..ff3e29d 100644 (file)
--- a/elmo/elmo-nntp.el
+++ b/elmo/elmo-nntp.el
@@ -41,33 +41,6 @@
 (require 'elmo)
 (require 'elmo-net)
 
-;; User options
-(defcustom elmo-nntp-default-server "localhost"
-  "*Default NNTP server."
-  :type 'string
-  :group 'elmo)
-
-(defcustom elmo-nntp-default-user nil
-  "*Default User of NNTP.  nil means no user authentication."
-  :type 'string
-  :group 'elmo)
-
-(defcustom elmo-nntp-default-port 119
-  "*Default Port number of NNTP."
-  :type 'integer
-  :group 'elmo)
-
-(defcustom elmo-nntp-default-stream-type nil
-  "*Default stream type for NNTP.
-Any symbol value of `elmo-network-stream-type-alist' or
-`elmo-nntp-stream-type-alist'."
-  :type 'symbol
-  :group 'elmo)
-
-(defvar elmo-nntp-stream-type-alist nil
-  "*Stream bindings for NNTP.
-This is taken precedence over `elmo-network-stream-type-alist'.")
-
 (defvar elmo-nntp-overview-fetch-chop-length 200
  "*Number of overviews to fetch in one request in nntp.")
 
@@ -115,7 +88,8 @@ This is taken precedence over `elmo-network-stream-type-alist'.")
       (unless (elmo-net-folder-stream-type-internal folder)
        (elmo-net-folder-set-stream-type-internal
         folder
-        elmo-nntp-default-stream-type))
+        (elmo-get-network-stream-type
+         elmo-nntp-default-stream-type)))
       folder)))
 
 (luna-define-method elmo-folder-expand-msgdb-path ((folder elmo-nntp-folder))
@@ -277,6 +251,8 @@ Don't cache if nil.")
       (setq elmo-nntp-read-point (point))
       (or (elmo-nntp-read-response session t)
          (error "Cannot open network"))
+      (if elmo-nntp-send-mode-reader
+         (elmo-nntp-send-mode-reader session))
       (when (eq (elmo-network-stream-type-symbol
                 (elmo-network-session-stream-type-internal session))
                'starttls)
@@ -304,8 +280,6 @@ Don't cache if nil.")
 
 (luna-define-method elmo-network-setup-session ((session
                                                 elmo-nntp-session))
-  (if elmo-nntp-send-mode-reader
-      (elmo-nntp-send-mode-reader session))
   (run-hooks 'elmo-nntp-opened-hook))
 
 (defun elmo-nntp-process-filter (process output)
@@ -1012,7 +986,9 @@ Don't cache if nil.")
                   :user elmo-nntp-default-user
                   :server hostname
                   :port elmo-nntp-default-port
-                  :stream-type elmo-nntp-default-stream-type)))
+                  :stream-type
+                  (elmo-get-network-stream-type
+                   elmo-nntp-default-stream-type))))
        response has-message-id)
     (save-excursion
       (set-buffer content-buf)