2001-12-20 Simon Josefsson <jas@extundo.com>

	* nnimap.el (top-level): Don't require cl.  Suggested by ShengHuo
	ZHU <zsh@cs.rochester.edu>.
	(nnimap-close-group): Don't quote KEYLIST items.  Suggested by
	Brian P Templeton <bpt@tunes.org>.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 156e5f3..5653465 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2001-12-20  Simon Josefsson  <jas@extundo.com>
+
+       * nnimap.el (top-level): Don't require cl.  Suggested by ShengHuo
+       ZHU <zsh@cs.rochester.edu>.
+       (nnimap-close-group): Don't quote KEYLIST items.  Suggested by
+       Brian P Templeton <bpt@tunes.org>.
+
 2001-12-19 17:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * nnmaildir.el: New.

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index c82011f..a5bd4d4 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -58,10 +58,7 @@
 
 ;;; Code:
 
-(eval-and-compile
-  (require 'cl)
-  (require 'imap))
-
+(require 'imap)
 (require 'nnoo)
 (require 'nnmail)
 (require 'nnheader)
@@ -846,9 +843,9 @@ function is generally only called when Gnus is shutting down."
     (when (and (imap-opened)
               (nnimap-possibly-change-group group server))
       (case nnimap-expunge-on-close
-       ('always (imap-mailbox-expunge nnimap-close-asynchronous)
+       (always (imap-mailbox-expunge nnimap-close-asynchronous)
                 (imap-mailbox-close nnimap-close-asynchronous))
-       ('ask (if (and (imap-search "DELETED")
+       (ask (if (and (imap-search "DELETED")
                       (gnus-y-or-n-p (format
                                       "Expunge articles in group `%s'? "
                                       imap-current-mailbox)))