From 2c226da891c5726ab3e5bf7e0b55344529ad5d00 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Tue, 3 Sep 2002 22:30:37 +0000 Subject: [PATCH] Synch with Oort Gnus. --- lisp/ChangeLog | 6 ++++++ lisp/gnus-agent.el | 1 + lisp/nntp.el | 3 ++- texi/ChangeLog | 6 ++++++ texi/gnus-ja.texi | 11 +++++++---- texi/gnus.texi | 6 +++++- 6 files changed, 27 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5a03ddf..47fe33c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2002-09-03 Simon Josefsson + + * nntp.el (nntp-wait-for-string): Dont infloop if process died. + + * gnus-agent.el (gnus-agent-batch): Add doc. + 2002-09-03 Josh Huber * 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 --- 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 --- 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 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,9 @@ +2002-09-03 Simon Josefsson + + * gnus.texi (Direct Functions, Common Variables): Named ports like + "snews" doesn't work with some external tools. Thanks to + "D. Watson" for noting this. + 2002-09-01 Simon Josefsson * 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 --- a/texi/gnus-ja.texi +++ b/texi/gnus-ja.texi @@ -11507,13 +11507,14 @@ OpenSSL (@uref{http://www.openssl.org}) か SSLeay からサーバーを次のように定義します: @lisp -;; Type `C-c C-c' after you've finished editing. +;; 編集し終わったら `C-c C-c' をタイプして下さい。 ;; -;; "snews" is port 563 and is predefined in our /etc/services +;; ポート 563 が "snews" として /etc/services で定義済みであっても +;; openssl s_client -port でその名前は使えません。 ;; (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 のセッション全体をラップして、ディフォルトのメソッドを使うというの @item nntp-port-number @vindex nntp-port-number 接続する @sc{nntp} サーバーのポート番号です。ディフォルト -は @samp{nntp} です。 +は @samp{nntp} です。@sc{ssl} を介した @sc{nntp} を使うには、ポートの名 +前ではなくて整数 (つまり @samp{snews} ではなくて @samp{563}) を指定して +下さい。外部の SSL ツールはポートの名前では動作しないからです。 @item nntp-end-of-line @vindex nntp-end-of-line diff --git a/texi/gnus.texi b/texi/gnus.texi index 8474d9f..7865389 100644 --- 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 -- 1.7.10.4