* imap.el (imap-close): Keep going if quit.

And copyright fixes.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 19a599d..de78c95 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2002-01-12  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
+       * imap.el (imap-close): Keep going if quit.
+
        * gnus-agent.el (gnus-agent-retrieve-headers): Erase
        nntp-server-buffer.
 

diff --git a/lisp/flow-fill.el b/lisp/flow-fill.el
index 7fec21b..e7ca680 100644 (file)
--- a/lisp/flow-fill.el
+++ b/lisp/flow-fill.el
@@ -1,6 +1,6 @@
 ;;; flow-fill.el --- interprete RFC2646 "flowed" text
 
-;; Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <jas@pdc.kth.se>
 ;; Keywords: mail

diff --git a/lisp/gnus-logic.el b/lisp/gnus-logic.el
index be43350..77fc948 100644 (file)
--- a/lisp/gnus-logic.el
+++ b/lisp/gnus-logic.el
@@ -1,5 +1,5 @@
 ;;; gnus-logic.el --- advanced scoring code for Gnus
-;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>

diff --git a/lisp/imap.el b/lisp/imap.el
index f5237ff..50a176c 100644 (file)
--- a/lisp/imap.el
+++ b/lisp/imap.el
@@ -1026,7 +1026,9 @@ password is remembered in the buffer."
 If BUFFER is nil, the current buffer is used."
   (with-current-buffer (or buffer (current-buffer))
     (when (imap-opened)
-      (imap-send-command-wait "LOGOUT"))
+      (condition-case nil
+         (imap-send-command-wait "LOGOUT")
+       (quit nil)))
     (when (and imap-process
               (memq (process-status imap-process) '(open run)))
       (delete-process imap-process))

diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index ea3c668..06a6c71 100644 (file)
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -1,5 +1,5 @@
 ;;; mm-view.el --- functions for viewing MIME objects
-;; Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; This file is part of GNU Emacs.