* nntp.el (nntp-retrieve-groups): Check whether BUF is live.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 30922a7..7ecde99 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2002-02-03  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
+       * nntp.el (nntp-retrieve-groups): Check whether BUF is live.
+
        * message.el (message-forward-rmail-make-body): Directly use
        rmail-msg-restore-non-pruned-header to avoid calling
        vertical-motion.

diff --git a/lisp/message.el b/lisp/message.el
index e26a85f..cdd2497 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -5022,6 +5022,8 @@ Optional DIGEST will use digest to forward."
 (defun message-forward-rmail-make-body (forward-buffer)
   (save-window-excursion
     (set-buffer forward-buffer)
+    ;; Rmail doesn't have rmail-msg-restore-non-pruned-header in Emacs
+    ;; 20.  FIXIT, or we drop support for rmail in Emacs 20.
     (if (rmail-msg-is-pruned)
        (rmail-msg-restore-non-pruned-header)))
   (message-forward-make-body forward-buffer))

diff --git a/lisp/nntp.el b/lisp/nntp.el
index 3e57e1e..3a0265b 100644 (file)
--- a/lisp/nntp.el
+++ b/lisp/nntp.el
@@ -577,6 +577,10 @@ noticing asynchronous data.")
              (command (if nntp-server-list-active-group
                           "LIST ACTIVE" "GROUP")))
          (while groups
+           ;; Timeout may have killed the buffer.
+           (unless (gnus-buffer-live-p buf)
+             (nnheader-report 'nntp "Connection to %s is closed." server)
+             (throw 'done nil))
            ;; Send the command to the server.
            (nntp-send-command nil command (pop groups))
            (incf count)