From: yamaoka <yamaoka>
Date: Wed, 9 Aug 2000 10:45:18 +0000 (+0000)
Subject: Sync with `t-gnus-6_14'.
X-Git-Tag: t-gnus-6_14-quimby-before-installer-changed-~151
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8fae24bae9dde44b893c642eece8f3c8c6f88b2b;p=elisp%2Fgnus.git-

Sync with `t-gnus-6_14'.
---

diff --git a/ChangeLog b/ChangeLog
index 99151bf..4c7afe9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-08-09  Katsumi Yamaoka <yamaoka@jpl.org>
+
+	* lisp/nntp.el (nntp-open-telnet): Wait for the telnet prompt
+	before sending a command; allow the rtelnet prompt as well.
+
+	* lisp/message.el (message-make-forward-subject): Remove garbage
+	line.
+
 2000-08-01  Katsumi Yamaoka <yamaoka@jpl.org>
 
 	* configure: Regenerate.
diff --git a/lisp/message.el b/lisp/message.el
index e0e3f1e..a910739 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -4925,7 +4925,6 @@ the message."
   "Return a Subject header suitable for the message in the current buffer."
   (save-excursion
     (save-restriction
-      (current-buffer)
       (message-narrow-to-head)
       (let ((funcs message-make-forward-subject-function)
 	    (subject (message-fetch-field "Subject")))
diff --git a/lisp/nntp.el b/lisp/nntp.el
index b7919b9..846b61f 100644
--- a/lisp/nntp.el
+++ b/lisp/nntp.el
@@ -1297,6 +1297,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)
@@ -1326,7 +1327,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)