Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5a03ddf..47fe33c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2002-09-03  Simon Josefsson  <jas@extundo.com>
+
+       * nntp.el (nntp-wait-for-string): Dont infloop if process died.
+
+       * gnus-agent.el (gnus-agent-batch): Add doc.
+
 2002-09-03  Josh Huber <huber@alum.wpi.edu>
 
        * gnus-msg.el (gnus-summary-handle-replysign): Change the order we

diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el
index b69e845..27dac87 100644 (file)
--- a/lisp/gnus-agent.el
+++ b/lisp/gnus-agent.el
@@ -1904,6 +1904,7 @@ and GROUP without FORCE is not supported."
 
 ;;;###autoload
 (defun gnus-agent-batch ()
+  "Start Gnus, send queue and fetch session."
   (interactive)
   (let ((init-file-user "")
        (gnus-always-read-dribble-file t))

diff --git a/lisp/nntp.el b/lisp/nntp.el
index 047b8a5..c02b139 100644 (file)
--- a/lisp/nntp.el
+++ b/lisp/nntp.el
@@ -1525,7 +1525,8 @@ password contained in '~/.nntp-authinfo'."
   "Wait until string arrives in the buffer."
   (let ((buf (current-buffer)))
     (goto-char (point-min))
-    (while (not (re-search-forward regexp nil t))
+    (while (and (nntp-find-connection nntp-server-buffer)
+               (not (re-search-forward regexp nil t)))
       (accept-process-output (nntp-find-connection nntp-server-buffer))
       (set-buffer buf)
       (goto-char (point-min)))))

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 5feba52..2a9512c 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,9 @@
+2002-09-03  Simon Josefsson  <jas@extundo.com>
+
+       * gnus.texi (Direct Functions, Common Variables): Named ports like
+       "snews" doesn't work with some external tools.  Thanks to
+       "D. Watson" <djwatson@u.washington.edu> for noting this.
+
 2002-09-01  Simon Josefsson  <jas@extundo.com>
 
        * gnus.texi (Gnus Unplugged): Fix, agent is now enabled by default.

diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 03ba563..d83d7c5 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -11507,13 +11507,14 @@ OpenSSL (@uref{http://www.openssl.org}) \e$B$+\e(B SSLeay
 \e$B$+$i%5!<%P!<$r<!$N$h$&$KDj5A$7$^$9\e(B:
 
 @lisp
-;; Type `C-c C-c' after you've finished editing.
+;; \e$BJT=8$7=*$o$C$?$i\e(B `C-c C-c' \e$B$r%?%$%W$7$F2<$5$$!#\e(B
 ;;
-;; "snews" is port 563 and is predefined in our /etc/services
+;; \e$B%]!<%H\e(B 563 \e$B$,\e(B "snews" \e$B$H$7$F\e(B /etc/services \e$B$GDj5A:Q$_$G$"$C$F$b\e(B
+;; openssl s_client -port \e$B$G$=$NL>A0$O;H$($^$;$s!#\e(B
 ;;
 (nntp "snews.bar.com"
       (nntp-open-connection-function nntp-open-ssl-stream)
-      (nntp-port-number "snews")
+      (nntp-port-number 563)
       (nntp-address "snews.bar.com"))
 @end lisp
 
@@ -11640,7 +11641,9 @@ Emacs \e$B$N%;%C%7%g%sA4BN$r%i%C%W$7$F!"%G%#%U%)%k%H$N%a%=%C%I$r;H$&$H$$$&$N\e(B
 @item nntp-port-number
 @vindex nntp-port-number
 \e$B@\B3$9$k\e(B @sc{nntp} \e$B%5!<%P!<$N%]!<%HHV9f$G$9!#%G%#%U%)%k%H\e(B
-\e$B$O\e(B @samp{nntp} \e$B$G$9!#\e(B
+\e$B$O\e(B @samp{nntp} \e$B$G$9!#\e(B@sc{ssl} \e$B$r2p$7$?\e(B @sc{nntp} \e$B$r;H$&$K$O!"%]!<%H$NL>\e(B
+\e$BA0$G$O$J$/$F@0?t\e(B (\e$B$D$^$j\e(B @samp{snews} \e$B$G$O$J$/$F\e(B @samp{563}) \e$B$r;XDj$7$F\e(B
+\e$B2<$5$$!#30It$N\e(B SSL \e$B%D!<%k$O%]!<%H$NL>A0$G$OF0:n$7$J$$$+$i$G$9!#\e(B
 
 @item nntp-end-of-line
 @vindex nntp-end-of-line

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 8474d9f..7865389 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -12045,10 +12045,11 @@ define a server as follows:
 ;; Type `C-c C-c' after you've finished editing.
 ;;
 ;; "snews" is port 563 and is predefined in our /etc/services
+;; however, openssl s_client -port doesn't like named ports
 ;;
 (nntp "snews.bar.com"
       (nntp-open-connection-function nntp-open-ssl-stream)
-      (nntp-port-number "snews")
+      (nntp-port-number 563)
       (nntp-address "snews.bar.com"))
 @end lisp
 
@@ -12186,6 +12187,9 @@ The address of the @sc{nntp} server.
 @item nntp-port-number
 @vindex nntp-port-number
 Port number to connect to the @sc{nntp} server.  The default is @samp{nntp}.
+If you use @sc{nntp} over @sc{ssl}, you may want to use integer ports rather
+than named ports (i.e, use @samp{563} instead of @samp{snews}), because
+external SSL tools may not work with named ports.
 
 @item nntp-end-of-line
 @vindex nntp-end-of-line