Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 87b5cdb..ac0aff3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2002-06-28  Katsumi Yamaoka <yamaoka@jpl.org>
+
+       * nntp.el (nntp-open-via-rlogin-and-telnet): Hide commandline args.
+
 2002-06-26  Kai Gro\e,b_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * message.el (message-font-lock-keywords): Revert 2002-06-22

diff --git a/lisp/nntp.el b/lisp/nntp.el
index 8bbf408..004ee06 100644 (file)
--- a/lisp/nntp.el
+++ b/lisp/nntp.el
@@ -1673,8 +1673,7 @@ Please refer to the following variables to customize the connection:
 - `nntp-end-of-line'."
   (let ((command `(,nntp-via-address
                   ,nntp-telnet-command
-                  ,@nntp-telnet-switches
-                  ,nntp-address ,nntp-port-number))
+                  ,@nntp-telnet-switches))
        proc)
     (and nntp-via-user-name
         (setq command `("-l" ,nntp-via-user-name ,@command)))
@@ -1685,6 +1684,9 @@ Please refer to the following variables to customize the connection:
                (apply 'start-process "nntpd" buffer command)))
     (save-excursion
       (set-buffer buffer)
+      (nntp-wait-for-string "^r?telnet")
+      (process-send-string proc (concat "open " nntp-address
+                                       " " nntp-port-number "\n"))
       (nntp-wait-for-string "^\r*20[01]")
       (beginning-of-line)
       (delete-region (point-min) (point))