* gnus-group.el (gnus-group-expire-articles): Doc fix.

* nntp.el (nntp-accept-process-output): Use a 0.1 second timeout.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a07d1b9..11fbe7a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2003-01-05  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * gnus-group.el (gnus-group-expire-articles): Doc fix.
+
+       * nntp.el (nntp-accept-process-output): Use a 0.1 second timeout. 
+
        * gnus.el (gnus-version-number): Bump version number.
 
 2003-01-05 01:53:30 Lars Magne Ingebrigtsen <lars@ingebrigtsen.no>

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index e6fda64..04dc13f 100644 (file)
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -3031,7 +3031,8 @@ or nil if no action could be taken."
       num)))
 
 (defun gnus-group-expire-articles (&optional n)
-  "Expire all expirable articles in the current newsgroup."
+  "Expire all expirable articles in the current newsgroup.
+Uses the process/prefix convention."
   (interactive "P")
   (let ((groups (gnus-group-process-prefix n))
        group)

diff --git a/lisp/nntp.el b/lisp/nntp.el
index 5e8d1cb..6b5543b 100644 (file)
--- a/lisp/nntp.el
+++ b/lisp/nntp.el
@@ -1243,7 +1243,9 @@ password contained in '~/.nntp-authinfo'."
       (unless (< len 10)
        (setq nntp-have-messaged t)
        (nnheader-message 7 "nntp read: %dk" len)))
-    (accept-process-output process (or timeout 1))
+    (if timeout
+       (accept-process-output process timeout)
+      (accept-process-output process 0 100))
     ;; accept-process-output may update status of process to indicate
     ;; that the server has closed the connection.  This MUST be
     ;; handled here as the buffer restored by the save-excursion may