2000-10-09 17:12:00 ShengHuo ZHU <zsh@cs.rochester.edu>

	* nntp.el (nntp-open-connection): Kill process buffer when quit.
	(nntp-connection-timeout): Add a note. SIGALRM is ignored in both
	FSF Emacs 20 and XEmacs 21.
	* gnus-agent.el (gnus-agent-fetch-session): Catch quit.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 433a4dd..6af3a91 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2000-10-09 17:12:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * nntp.el (nntp-open-connection): Kill process buffer when quit.
+       (nntp-connection-timeout): Add a note. SIGALRM is ignored in both
+       FSF Emacs 20 and XEmacs 21.
+       * gnus-agent.el (gnus-agent-fetch-session): Catch quit.
+
 2000-10-09  Dave Love  <fx@gnu.org>
 
        * gnus-audio.el: Don't require cl.

diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el
index 8a89729..bb0ad58 100644 (file)
--- a/lisp/gnus-agent.el
+++ b/lisp/gnus-agent.el
@@ -1100,7 +1100,11 @@ the actual number of articles toggled is returned."
          (error 
           (unless (funcall gnus-agent-confirmation-function
                            (format "Error (%s).  Continue? " err))
-            (error "Cannot fetch articles into the Gnus agent."))))
+            (error "Cannot fetch articles into the Gnus agent.")))
+         (quit 
+          (unless (funcall gnus-agent-confirmation-function
+                           (format "Quit (%s).  Continue? " err))
+            (signal 'quit "Cannot fetch articles into the Gnus agent."))))
        (pop methods))
       (gnus-message 6 "Finished fetching articles into the Gnus agent"))))
 

diff --git a/lisp/nntp.el b/lisp/nntp.el
index a128219..6044c93 100644 (file)
--- a/lisp/nntp.el
+++ b/lisp/nntp.el
@@ -180,7 +180,8 @@ server there that you can connect to.  See also
 
 (defvoo nntp-connection-timeout nil
   "*Number of seconds to wait before an nntp connection times out.
-If this variable is nil, which is the default, no timers are set.")
+If this variable is nil, which is the default, no timers are set.
+NOTE: This variable is never seen to work in FSF Emacs 20 and XEmacs 21.")
 
 ;;; Internal variables.
 
@@ -879,6 +880,7 @@ password contained in '~/.nntp-authinfo'."
            (error nil)
            (quit
             (message "Quit opening connection")
+            (nntp-kill-buffer pbuffer)
             (signal 'quit nil)
             nil))))
     (when timer