2000-08-09 10:21:20 Katsumi Yamaoka <yamaoka@jpl.org>

       * nntp.el (nntp-open-telnet): Wait for the telnet prompt before
       sending a command; allow the rtelnet prompt as well.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ab3b675..f972b55 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-09 10:21:20  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * nntp.el (nntp-open-telnet): Wait for the telnet prompt before
+       sending a command; allow the rtelnet prompt as well.
+
 2000-09-29  Simon Josefsson  <simon@josefsson.org>
 
        * message.el (message-send): Make sure error is signalled if no

diff --git a/lisp/nntp.el b/lisp/nntp.el
index 5ced1d7..62e8de2 100644 (file)
--- a/lisp/nntp.el
+++ b/lisp/nntp.el
@@ -1272,6 +1272,7 @@ password contained in '~/.nntp-authinfo'."
                 "nntpd" buffer nntp-telnet-command nntp-telnet-switches))
          (case-fold-search t))
       (when (memq (process-status proc) '(open run))
+       (nntp-wait-for-string "^r?telnet")
        (process-send-string proc "set escape \^X\n")
        (cond
         ((and nntp-open-telnet-envuser nntp-telnet-user-name)
@@ -1301,7 +1302,7 @@ password contained in '~/.nntp-authinfo'."
        (beginning-of-line)
        (delete-region (point-min) (point))
        (process-send-string proc "\^]")
-       (nntp-wait-for-string "^telnet")
+       (nntp-wait-for-string "^r?telnet")
        (process-send-string proc "mode character\n")
        (accept-process-output proc 1)
        (sit-for 1)