2000-11-15 13:21 ShengHuo ZHU <zsh@cs.rochester.edu>

[gnus] / lisp / mail-source.el

diff --git a/lisp/mail-source.el b/lisp/mail-source.el
index a478ec4..2729791 100644 (file)
--- a/lisp/mail-source.el
+++ b/lisp/mail-source.el
@@ -25,10 +25,14 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'cl))
+(eval-when-compile
+  (require 'cl)
+  (require 'imap)
+  (eval-when-compile (defvar display-time-mail-function)))
 (eval-and-compile
   (autoload 'pop3-movemail "pop3")
-  (autoload 'pop3-get-message-count "pop3"))
+  (autoload 'pop3-get-message-count "pop3")
+  (autoload 'nnheader-cancel-timer "nnheader"))
 (require 'format-spec)
 (require 'mm-util)
 
@@ -36,6 +40,18 @@
   "The mail-fetching library."
   :group 'gnus)
 
+;; Define these at compile time to avoid dragging in imap always.
+(defconst mail-source-imap-authenticators
+  (eval-when-compile
+    (mapcar (lambda (a)
+             (list 'const (car a)))
+     imap-authenticator-alist)))
+(defconst mail-source-imap-streams
+  (eval-when-compile
+    (mapcar (lambda (a)
+             (list 'const (car a)))
+     imap-stream-alist)))
+
 (defcustom mail-sources nil
   "*Where the mail backends will look for incoming mail.
 This variable is a list of mail source specifiers.
@@ -141,33 +157,25 @@ See Info node `(gnus)Mail Source Specifiers'."
                                          (const :format "" :value :stream)
                                          (choice :tag "Stream"
                                                  :value network
-                                                 ,@(progn (require 'imap)
-                                                          (mapcar
-                                                           (lambda (a)
-                                                             (list 'const
-                                                                   (car a)))
-                                                           imap-stream-alist
-                                                           ))))
+                                                 ,@mail-source-imap-streams))
                                   (group :inline t
                                          (const :format ""
                                                 :value :authenticator)
                                          (choice :tag "Authenticator"
                                                  :value login
-                                                 ,@(progn (require 'imap)
-                                                          (mapcar
-                                                           (lambda (a)
-                                                             (list 'const
-                                                                   (car a)))
-                                                           imap-authenticator-alist))))
+                                                 ,@mail-source-imap-authenticators))
                                   (group :inline t
                                          (const :format "" :value :mailbox)
-                                         (string :tag "Mailbox"))
+                                         (string :tag "Mailbox"
+                                                 :value "INBOX"))
                                   (group :inline t
                                          (const :format "" :value :predicate)
-                                         (function :tag "Predicate"))
+                                         (string :tag "Predicate" 
+                                                 :value "UNSEEN UNDELETED"))
                                   (group :inline t
                                          (const :format "" :value :fetchflag)
-                                         (string :tag "Fetchflag"))
+                                         (string :tag "Fetchflag"
+                                                 :value  "\\Deleted"))
                                   (group :inline t
                                          (const :format ""
                                                 :value :dontexpunge)