* elmo-nntp.el (elmo-folder-initialize): Don't use

elmo-nntp-default-user if zero-length username is specified
explicitly.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 4311b08..3ac5e87 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,9 @@
+2003-07-12  Yuuichi Teranishi  <teranisi@gohome.org>
+
+       * elmo-nntp.el (elmo-folder-initialize): Don't use
+       elmo-nntp-default-user if zero-length username is specified
+       explicitly.
+
 2003-07-06  Yoichi NAKAYAMA  <yoichi@geiin.org>
 
        * elmo-nntp.el (elmo-nntp-folder-list-subfolders): Don't omit

diff --git a/elmo/elmo-nntp.el b/elmo/elmo-nntp.el
index 6abe77f..4b889a7 100644 (file)
--- a/elmo/elmo-nntp.el
+++ b/elmo/elmo-nntp.el
@@ -95,16 +95,18 @@ Debug information is inserted in the buffer \"*NNTP DEBUG*\"")
                   (append elmo-nntp-stream-type-alist
                           elmo-network-stream-type-alist))
           elmo-network-stream-type-alist))
-       parse)
+       explicit-user parse)
     (setq name (luna-call-next-method))
     (setq parse (elmo-parse-token name ":"))
     (elmo-nntp-folder-set-group-internal folder
                                         (elmo-nntp-encode-group-string
                                          (car parse)))
+    (setq explicit-user (eq ?: (string-to-char (cdr parse))))    
     (setq parse (elmo-parse-prefixed-element ?: (cdr parse)))
     (elmo-net-folder-set-user-internal folder
                                       (if (eq (length (car parse)) 0)
-                                          elmo-nntp-default-user
+                                          (unless explicit-user
+                                            elmo-nntp-default-user)
                                         (car parse)))
     (unless (elmo-net-folder-server-internal folder)
       (elmo-net-folder-set-server-internal folder