Sync.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b9afb90..6b7ab63 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2000-04-24 21:11:48  Shenghuo ZHU  <zsh@cs.rochester.edu>
+
+       * gnus-util.el (gnus-netrc-machine): Another default to nntp.
+
 2000-04-24 18:14:12  Shenghuo ZHU  <zsh@cs.rochester.edu>
 
        * gnus-draft.el (gnus-draft-setup): Restore mml only when

diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el
index d3d4309..c6ea284 100644 (file)
--- a/lisp/gnus-util.el
+++ b/lisp/gnus-util.el
@@ -920,7 +920,8 @@ ARG is passed to the first function."
       (setq result (nreverse result))
       (while (and result
                  (not (equal (or port "nntp")
-                             (gnus-netrc-get (car result) "port"))))
+                             (or (gnus-netrc-get (car result) "port")
+                                 "nntp"))))
        (pop result))
       (car result))))