Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ac0aff3..8bbb610 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2002-06-28  Katsumi Yamaoka <yamaoka@jpl.org>
 
+       * nntp.el (nntp-open-via-rlogin-and-telnet): Revert last change.
+
+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>

diff --git a/lisp/nntp.el b/lisp/nntp.el
index 004ee06..8bbf408 100644 (file)
--- a/lisp/nntp.el
+++ b/lisp/nntp.el
@@ -1673,7 +1673,8 @@ 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-telnet-switches
+                  ,nntp-address ,nntp-port-number))
        proc)
     (and nntp-via-user-name
         (setq command `("-l" ,nntp-via-user-name ,@command)))
@@ -1684,9 +1685,6 @@ 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))