2000-10-26 Dave Love <fx@gnu.org>

* mail-source.el: Require imap when compiling and defvar display-time-mail-function. Require mm-util. (nnheader-cancel-timer): Autoload. (mail-source-imap-authenticators, mail-source-imap-streams): New variables. (mail-sources): Use them. (defvar): Use rmail-spool-directory unconditionally. 2000-10-26 Per Abrahamsen <abraham@dina.kvl.dk> * mail-source.el (mail-sources): Better `:type'. 2000-10-26 Kai Gro�ohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> * mail-source.el (mail-source-keyword-map): Use `rmail-spool-directory' as a default directory for the `file' source, if the variable is defined. Fall back to hardcoded "/usr/spool/mail/", as before. Suggestion by Steven E. Harris <seh@speakeasy.org>.
author: Dave Love 2000-10-26 17:13:22 +0000
committer: Dave Love 2000-10-26 17:13:22 +0000
commit: 4f926b3e43fdd96feb861f5fafd5cd9920ffa873 (patch)
tree: 05d2643a45b3d1642033bd8bd87492f7b0618292
parent: 8490337987c917ae1cbe892c34afcd588e14511c (diff)
download: emacs-4f926b3e43fdd96feb861f5fafd5cd9920ffa873.tar.gz
emacs-4f926b3e43fdd96feb861f5fafd5cd9920ffa873.zip
1 files changed, 170 insertions, 132 deletions
diff --git a/lisp/gnus/mail-source.el b/lisp/gnus/mail-source.el
index 613038aa03b..a6be19cfae2 100644
--- a/lisp/gnus/mail-source.el
+++ b/lisp/gnus/mail-source.el
@@ -2,6 +2,7 @@
 ;; Copyright (C) 1999, 2000 Free Software Foundation, Inc.
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
+;; Maintainer: bugs@gnus.org
 ;; Keywords: news, mail
 ;; This file is part of GNU Emacs.
@@ -25,153 +26,190 @@
 ;;; 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)
 (defgroup mail-source nil
  "The mail-fetching library."
  :version "21.1"
  :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.
 See Info node `(gnus)Mail Source Specifiers'."
  :group 'mail-source
-  ;; This specification should be tidied up, particularly to avoid
-  ;; constant items appearing.  (Perhaps there's scope for improvment
-  ;; in the widget code.)
  :type `(repeat
-          (choice (const :tag "Default spool file" (file))
+          (choice :format "%[Value Menu%] %v"
-                  (list :tag "Specified spool file"
+                  :value (file)
-                        (const file)
+                  (cons :tag "Spool file"
-                        (const :value :path)
+                        (const :format "" file)
-                        file)
+                        (checklist :tag "Options" :greedy t
+                                   (group :inline t
+                                          (const :format "" :value :path)
+                                          file)))
                  (cons :tag "Several files in a directory"
-                        (const directory)
+                        (const :format "" directory)
-                        (choice
+                        (checklist :tag "Options" :greedy t
-                         :tag "Options"
+                                   (group :inline t
-                         (const :tag "None" nil)
+                                          (const :format "" :value :path)
-                         (repeat
+                                          (directory :tag "Path"))
-                          (choice
+                                   (group :inline t
-                           (list :inline t :tag "path"
+                                          (const :format "" :value :suffix)
-                                 (const :value :path) directory)
+                                          (string :tag "Suffix"))
-                           (list :inline t :tag "suffix"
+                                   (group :inline t
-                                 (const :value :suffix) string)
+                                          (const :format "" :value :predicate)
-                           (list :inline t :tag "predicate"
+                                          (function :tag "Predicate"))
-                                 (const :value :predicate) function)
+                                   (group :inline t
-                           (list :inline t :tag "prescript"
+                                          (const :format "" :value :prescript)
-                                 (const :value :prescript) string)
+                                          (string :tag "Prescript"))
-                           (list :inline t :tag "postscript"
+                                   (group :inline t
-                                 (const :value :postscript) string)
+                                          (const :format "" :value :postscript)
-                           (list :inline t :tag "plugged"
+                                          (string :tag "Postscript"))
-                                 (const :value :plugged) boolean)))))
+                                   (group :inline t
+                                          (const :format "" :value :plugged)
+                                          (boolean :tag "Plugged"))))
                  (cons :tag "POP3 server"
-                        (const pop)
+                        (const :format "" pop)
-                        (choice
+                        (checklist :tag "Options" :greedy t
-                         :tag "Options"
+                                   (group :inline t
-                         (const :tag "None" nil)
+                                          (const :format "" :value :server) 
-                         (repeat
+                                          (string :tag "Server"))
-                          (choice
+                                   (group :inline t
-                           (list :inline t :tag "server"
+                                          (const :format "" :value :port) 
-                                 (const :value :server) string)
+                                          (choice :tag "Port"
-                           (list :inline t :tag "port"
+                                                  :value "pop3" 
-                                 (const :value :port) (choice number string))
+                                                  (number :format "%v")
-                           (list :inline t :tag "user"
+                                                  (string :format "%v")))
-                                 (const :value :user) string)
+                                   (group :inline t
-                           (list :inline t :tag "password"
+                                          (const :format "" :value :user)
-                                 (const :value :password) string)
+                                          (string :tag "User"))
-                           (list :inline t :tag "program"
+                                   (group :inline t
-                                 (const :value :program) string)
+                                          (const :format "" :value :password)
-                           (list :inline t :tag "prescript"
+                                          (string :tag "Password"))
-                                 (const :value :prescript) string)
+                                   (group :inline t
-                           (list :inline t :tag "postscript"
+                                          (const :format "" :value :program)
-                                 (const :value :postscript) string)
+                                          (string :tag "Program"))
-                           (list :inline t :tag "function"
+                                   (group :inline t
-                                 (const :value :function) function)
+                                          (const :format "" :value :prescript)
-                           (list :inline t :tag "authentication"
+                                          (string :tag "Prescript"))
-                                 (const :value :authentication)
+                                   (group :inline t
-                                 (choice (const password)
+                                          (const :format "" :value :postscript)
-                                         (const apop)))
+                                          (string :tag "Postscript"))
-                           (list :inline t :tag "plugged"
+                                   (group :inline t
-                                 (const :value :plugged) boolean)))))
+                                          (const :format "" :value :function)
+                                          (function :tag "Function"))
+                                   (group :inline t
+                                          (const :format "" 
+                                                 :value :authentication)
+                                          (choice :tag "Authentication"
+                                                  :value apop
+                                                  (const password)
+                                                  (const apop)))
+                                   (group :inline t
+                                          (const :format "" :value :plugged)
+                                          (boolean :tag "Plugged"))))
                  (cons :tag "Maildir (qmail, postfix...)"
-                        (const maildir)
+                        (const :format "" maildir)
-                        (choice
+                        (checklist :tag "Options" :greedy t
-                         :tag "Options"
+                                   (group :inline t
-                         (const :tag "None" nil)
+                                          (const :format "" :value :path)
-                         (repeat
+                                          (directory :tag "Path"))
-                          (choice
+                                   (group :inline t
-                           (list :inline t :tag "path"
+                                          (const :format "" :value :plugged)
-                                 (const :value :path) directory)
+                                          (boolean :tag "Plugged"))))
-                           (list :inline t :tag "plugged"
-                                 (const :value :plugged) boolean)))))
                  (cons :tag "IMAP server"
-                        (const imap)
+                        (const :format "" imap)
-                        (choice
+                        (checklist :tag "Options" :greedy t
-                         :tag "Options"
+                                   (group :inline t
-                         (const :tag "None" nil)
+                                          (const :format "" :value :server)
-                         (repeat
+                                          (string :tag "Server"))
-                          (choice
+                                   (group :inline t
-                           (list :inline t :tag "server"
+                                          (const :format "" :value :port)
-                                 (const :value :server) string)
+                                          (choice :tag "Port" 
-                           (list :inline t :tag "port"
+                                                  :value 143 
-                                 (const :value :port)
+                                                  number string))
-                                 (choice number string))
+                                   (group :inline t
-                           (list :inline t :tag "user"
+                                          (const :format "" :value :user)
-                                 (const :value :user) string)
+                                          (string :tag "User"))
-                           (list :inline t :tag "password"
+                                   (group :inline t
-                                 (const :value :password) string)
+                                          (const :format "" :value :password)
-                           (list :inline t :tag "stream"
+                                          (string :tag "Password"))
-                                 (const :value :stream)
+                                   (group :inline t
-                                 (choice ,@(progn (require 'imap)
+                                          (const :format "" :value :stream)
-                                                  (mapcar
+                                          (choice :tag "Stream"
-                                                   (lambda (a)
+                                                  :value network
-                                                     (list 'const (car a)))
+                                                  ,@mail-source-imap-streams))
-                                                   imap-stream-alist))))
+                                   (group :inline t
-                           (list :inline t :tag "authenticator"
+                                          (const :format ""
-                                 (const :value :authenticator)
+                                                 :value :authenticator)
-                                 (choice ,@(progn (require 'imap)
+                                          (choice :tag "Authenticator"
-                                                  (mapcar
+                                                  :value login
-                                                   (lambda (a)
+                                                  ,@mail-source-imap-authenticators))
-                                                     (list 'const (car a)))
+                                   (group :inline t
-                                                   imap-authenticator-alist))))
+                                          (const :format "" :value :mailbox)
-                           (list :inline t :tag "mailbox"
+                                          (string :tag "Mailbox"))
-                                 (const :value :mailbox) string)
+                                   (group :inline t
-                           (list :inline t :tag "predicate"
+                                          (const :format "" :value :predicate)
-                                 (const :value :predicate) function)
+                                          (function :tag "Predicate"))
-                           (list :inline t :tag "fetchflag"
+                                   (group :inline t
-                                 (const :value :fetchflag) string)
+                                          (const :format "" :value :fetchflag)
-                           (list :inline t :tag "dontexpunge"
+                                          (string :tag "Fetchflag"))
-                                 (const :value :dontexpunge) boolean)
+                                   (group :inline t
-                           (list :inline t :tag "plugged"
+                                          (const :format ""
-                                 (const :value :plugged) )))))
+                                                 :value :dontexpunge)
+                                          (boolean :tag "Dontexpunge"))
+                                   (group :inline t
+                                          (const :format "" :value :plugged)
+                                          (boolean :tag "Plugged"))))
                  (cons :tag "Webmail server"
-                        (const webmail)
+                        (const :format "" webmail)
-                        (choice
+                        (checklist :tag "Options" :greedy t
-                         :tag "Options"
+                                   (group :inline t 
-                         (const :tag "None" nil)
+                                         (const :format "" :value :subtype)
-                         (repeat
+                                         ;; Should be generated from
-                          (choice
+                                         ;; `webmail-type-definition', but we
-                           (list :inline t :tag "subtype"
+                                         ;; can't require webmail without W3.
-                                 (const :value :subtype)
+                                         (choice :tag "Subtype"
-                                 ;; Should be generated from
+                                                 :value hotmail
-                                 ;; `webmail-type-definition', but we
+                                                 (const hotmail)
-                                 ;; can't require webmail without W3.
+                                                 (const yahoo)
-                                 (choice (const hotmail) (const yahoo)
+                                                 (const netaddress)
-                                         (const netaddress) (const netscape)
+                                                 (const netscape)
-                                         (const my-deja)))
+                                                 (const my-deja)))
-                           (list :inline t :tag "user"
+                                   (group :inline t
-                                 (const :value :user) string)
+                                          (const :format "" :value :user)
-                           (list :inline t :tag "password"
+                                          (string :tag "User"))
-                                 (const :value :password) string)
+                                   (group :inline t
-                           (list :inline t :tag "dontexpunge"
+                                          (const :format "" :value :password)
-                                 (const :value :dontexpunge) boolean)
+                                          (string :tag "Password"))
-                           (list :inline t :tag "plugged"
+                                   (group :inline t
-                                 (const :value :plugged) boolean))))))))
+                                          (const :format ""
+                                                 :value :dontexpunge)
+                                          (boolean :tag "Dontexpunge"))
+                                   (group :inline t
+                                          (const :format "" :value :plugged)
+                                          (boolean :tag "Plugged")))))))
 (defcustom mail-source-primary-source nil
  "*Primary source for incoming mail.
@@ -234,7 +272,7 @@ Common keywords should be listed here.")
       (:prescript-delay)
       (:postscript)
       (:path (or (getenv "MAIL")
-                  (concat "/usr/spool/mail/" (user-login-name)))))
+                  (expand-file-name (user-login-name) rmail-spool-directory))))
      (directory
       (:path)
       (:suffix ".spool")
@@ -811,12 +849,12 @@ This only works when `display-time' is enabled."
                user (or (cdr (assoc from mail-source-password-cache))
                         password) buf)
               (imap-mailbox-select mailbox nil buf))
-          (let ((coding-system-for-write mail-source-imap-file-coding-system) 
+          (let ((coding-system-for-write mail-source-imap-file-coding-system)
-                ;; Avoid converting 8-bit chars from inserted strings to
-                ;; multibyte.
-                default-enable-multibyte-characters
                str)
            (with-temp-file mail-source-crash-box
+              ;; Avoid converting 8-bit chars from inserted strings to
+              ;; multibyte.
+              (mm-disable-multibyte)
              ;; remember password
              (with-current-buffer buf
                (when (or imap-password
author	Dave Love	2000-10-26 17:13:22 +0000
committer	Dave Love	2000-10-26 17:13:22 +0000
commit	4f926b3e43fdd96feb861f5fafd5cd9920ffa873 (patch)
tree	05d2643a45b3d1642033bd8bd87492f7b0618292
parent	8490337987c917ae1cbe892c34afcd588e14511c (diff)
download	emacs-4f926b3e43fdd96feb861f5fafd5cd9920ffa873.tar.gz emacs-4f926b3e43fdd96feb861f5fafd5cd9920ffa873.zip

diff --git a/lisp/gnus/mail-source.el b/lisp/gnus/mail-source.el index 613038aa03b..a6be19cfae2 100644 --- a/lisp/gnus/mail-source.el +++ b/lisp/gnus/mail-source.el
@@ -2,6 +2,7 @@
2	;; Copyright (C) 1999, 2000 Free Software Foundation, Inc.	2	;; Copyright (C) 1999, 2000 Free Software Foundation, Inc.
3		3
4	;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>	4	;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
		5	;; Maintainer: bugs@gnus.org
5	;; Keywords: news, mail	6	;; Keywords: news, mail
6		7
7	;; This file is part of GNU Emacs.	8	;; This file is part of GNU Emacs.
@@ -25,153 +26,190 @@
25		26
26	;;; Code:	27	;;; Code:
27		28
28	(eval-when-compile (require 'cl))	29	(eval-when-compile
		30	(require 'cl)
		31	(require 'imap)
		32	(eval-when-compile (defvar display-time-mail-function)))
29	(eval-and-compile	33	(eval-and-compile
30	(autoload 'pop3-movemail "pop3")	34	(autoload 'pop3-movemail "pop3")
31	(autoload 'pop3-get-message-count "pop3"))	35	(autoload 'pop3-get-message-count "pop3")
		36	(autoload 'nnheader-cancel-timer "nnheader"))
32	(require 'format-spec)	37	(require 'format-spec)
		38	(require 'mm-util)
33		39
34	(defgroup mail-source nil	40	(defgroup mail-source nil
35	"The mail-fetching library."	41	"The mail-fetching library."
36	:version "21.1"	42	:version "21.1"
37	:group 'gnus)	43	:group 'gnus)
38		44
		45	;; Define these at compile time to avoid dragging in imap always.
		46	(defconst mail-source-imap-authenticators
		47	(eval-when-compile
		48	(mapcar (lambda (a)
		49	(list 'const (car a)))
		50	imap-authenticator-alist)))
		51	(defconst mail-source-imap-streams
		52	(eval-when-compile
		53	(mapcar (lambda (a)
		54	(list 'const (car a)))
		55	imap-stream-alist)))
		56
39	(defcustom mail-sources nil	57	(defcustom mail-sources nil
40	"*Where the mail backends will look for incoming mail.	58	"*Where the mail backends will look for incoming mail.
41	This variable is a list of mail source specifiers.	59	This variable is a list of mail source specifiers.
42	See Info node `(gnus)Mail Source Specifiers'."	60	See Info node `(gnus)Mail Source Specifiers'."
43	:group 'mail-source	61	:group 'mail-source
44	;; This specification should be tidied up, particularly to avoid
45	;; constant items appearing. (Perhaps there's scope for improvment
46	;; in the widget code.)
47	:type `(repeat	62	:type `(repeat
48	(choice (const :tag "Default spool file" (file))	63	(choice :format "%[Value Menu%] %v"
49	(list :tag "Specified spool file"	64	:value (file)
50	(const file)	65	(cons :tag "Spool file"
51	(const :value :path)	66	(const :format "" file)
52	file)	67	(checklist :tag "Options" :greedy t
		68	(group :inline t
		69	(const :format "" :value :path)
		70	file)))
53	(cons :tag "Several files in a directory"	71	(cons :tag "Several files in a directory"
54	(const directory)	72	(const :format "" directory)
55	(choice	73	(checklist :tag "Options" :greedy t
56	:tag "Options"	74	(group :inline t
57	(const :tag "None" nil)	75	(const :format "" :value :path)
58	(repeat	76	(directory :tag "Path"))
59	(choice	77	(group :inline t
60	(list :inline t :tag "path"	78	(const :format "" :value :suffix)
61	(const :value :path) directory)	79	(string :tag "Suffix"))
62	(list :inline t :tag "suffix"	80	(group :inline t
63	(const :value :suffix) string)	81	(const :format "" :value :predicate)
64	(list :inline t :tag "predicate"	82	(function :tag "Predicate"))
65	(const :value :predicate) function)	83	(group :inline t
66	(list :inline t :tag "prescript"	84	(const :format "" :value :prescript)
67	(const :value :prescript) string)	85	(string :tag "Prescript"))
68	(list :inline t :tag "postscript"	86	(group :inline t
69	(const :value :postscript) string)	87	(const :format "" :value :postscript)
70	(list :inline t :tag "plugged"	88	(string :tag "Postscript"))
71	(const :value :plugged) boolean)))))	89	(group :inline t
		90	(const :format "" :value :plugged)
		91	(boolean :tag "Plugged"))))
72	(cons :tag "POP3 server"	92	(cons :tag "POP3 server"
73	(const pop)	93	(const :format "" pop)
74	(choice	94	(checklist :tag "Options" :greedy t
75	:tag "Options"	95	(group :inline t
76	(const :tag "None" nil)	96	(const :format "" :value :server)
77	(repeat	97	(string :tag "Server"))
78	(choice	98	(group :inline t
79	(list :inline t :tag "server"	99	(const :format "" :value :port)
80	(const :value :server) string)	100	(choice :tag "Port"
81	(list :inline t :tag "port"	101	:value "pop3"
82	(const :value :port) (choice number string))	102	(number :format "%v")
83	(list :inline t :tag "user"	103	(string :format "%v")))
84	(const :value :user) string)	104	(group :inline t
85	(list :inline t :tag "password"	105	(const :format "" :value :user)
86	(const :value :password) string)	106	(string :tag "User"))
87	(list :inline t :tag "program"	107	(group :inline t
88	(const :value :program) string)	108	(const :format "" :value :password)
89	(list :inline t :tag "prescript"	109	(string :tag "Password"))
90	(const :value :prescript) string)	110	(group :inline t
91	(list :inline t :tag "postscript"	111	(const :format "" :value :program)
92	(const :value :postscript) string)	112	(string :tag "Program"))
93	(list :inline t :tag "function"	113	(group :inline t
94	(const :value :function) function)	114	(const :format "" :value :prescript)
95	(list :inline t :tag "authentication"	115	(string :tag "Prescript"))
96	(const :value :authentication)	116	(group :inline t
97	(choice (const password)	117	(const :format "" :value :postscript)
98	(const apop)))	118	(string :tag "Postscript"))
99	(list :inline t :tag "plugged"	119	(group :inline t
100	(const :value :plugged) boolean)))))	120	(const :format "" :value :function)
		121	(function :tag "Function"))
		122	(group :inline t
		123	(const :format ""
		124	:value :authentication)
		125	(choice :tag "Authentication"
		126	:value apop
		127	(const password)
		128	(const apop)))
		129	(group :inline t
		130	(const :format "" :value :plugged)
		131	(boolean :tag "Plugged"))))
101	(cons :tag "Maildir (qmail, postfix...)"	132	(cons :tag "Maildir (qmail, postfix...)"
102	(const maildir)	133	(const :format "" maildir)
103	(choice	134	(checklist :tag "Options" :greedy t
104	:tag "Options"	135	(group :inline t
105	(const :tag "None" nil)	136	(const :format "" :value :path)
106	(repeat	137	(directory :tag "Path"))
107	(choice	138	(group :inline t
108	(list :inline t :tag "path"	139	(const :format "" :value :plugged)
109	(const :value :path) directory)	140	(boolean :tag "Plugged"))))
110	(list :inline t :tag "plugged"
111	(const :value :plugged) boolean)))))
112	(cons :tag "IMAP server"	141	(cons :tag "IMAP server"
113	(const imap)	142	(const :format "" imap)
114	(choice	143	(checklist :tag "Options" :greedy t
115	:tag "Options"	144	(group :inline t
116	(const :tag "None" nil)	145	(const :format "" :value :server)
117	(repeat	146	(string :tag "Server"))
118	(choice	147	(group :inline t
119	(list :inline t :tag "server"	148	(const :format "" :value :port)
120	(const :value :server) string)	149	(choice :tag "Port"
121	(list :inline t :tag "port"	150	:value 143
122	(const :value :port)	151	number string))
123	(choice number string))	152	(group :inline t
124	(list :inline t :tag "user"	153	(const :format "" :value :user)
125	(const :value :user) string)	154	(string :tag "User"))
126	(list :inline t :tag "password"	155	(group :inline t
127	(const :value :password) string)	156	(const :format "" :value :password)
128	(list :inline t :tag "stream"	157	(string :tag "Password"))
129	(const :value :stream)	158	(group :inline t
130	(choice ,@(progn (require 'imap)	159	(const :format "" :value :stream)
131	(mapcar	160	(choice :tag "Stream"
132	(lambda (a)	161	:value network
133	(list 'const (car a)))	162	,@mail-source-imap-streams))
134	imap-stream-alist))))	163	(group :inline t
135	(list :inline t :tag "authenticator"	164	(const :format ""
136	(const :value :authenticator)	165	:value :authenticator)
137	(choice ,@(progn (require 'imap)	166	(choice :tag "Authenticator"
138	(mapcar	167	:value login
139	(lambda (a)	168	,@mail-source-imap-authenticators))
140	(list 'const (car a)))	169	(group :inline t
141	imap-authenticator-alist))))	170	(const :format "" :value :mailbox)
142	(list :inline t :tag "mailbox"	171	(string :tag "Mailbox"))
143	(const :value :mailbox) string)	172	(group :inline t
144	(list :inline t :tag "predicate"	173	(const :format "" :value :predicate)
145	(const :value :predicate) function)	174	(function :tag "Predicate"))
146	(list :inline t :tag "fetchflag"	175	(group :inline t
147	(const :value :fetchflag) string)	176	(const :format "" :value :fetchflag)
148	(list :inline t :tag "dontexpunge"	177	(string :tag "Fetchflag"))
149	(const :value :dontexpunge) boolean)	178	(group :inline t
150	(list :inline t :tag "plugged"	179	(const :format ""
151	(const :value :plugged) )))))	180	:value :dontexpunge)
		181	(boolean :tag "Dontexpunge"))
		182	(group :inline t
		183	(const :format "" :value :plugged)
		184	(boolean :tag "Plugged"))))
152	(cons :tag "Webmail server"	185	(cons :tag "Webmail server"
153	(const webmail)	186	(const :format "" webmail)
154	(choice	187	(checklist :tag "Options" :greedy t
155	:tag "Options"	188	(group :inline t
156	(const :tag "None" nil)	189	(const :format "" :value :subtype)
157	(repeat	190	;; Should be generated from
158	(choice	191	;; `webmail-type-definition', but we
159	(list :inline t :tag "subtype"	192	;; can't require webmail without W3.
160	(const :value :subtype)	193	(choice :tag "Subtype"
161	;; Should be generated from	194	:value hotmail
162	;; `webmail-type-definition', but we	195	(const hotmail)
163	;; can't require webmail without W3.	196	(const yahoo)
164	(choice (const hotmail) (const yahoo)	197	(const netaddress)
165	(const netaddress) (const netscape)	198	(const netscape)
166	(const my-deja)))	199	(const my-deja)))
167	(list :inline t :tag "user"	200	(group :inline t
168	(const :value :user) string)	201	(const :format "" :value :user)
169	(list :inline t :tag "password"	202	(string :tag "User"))
170	(const :value :password) string)	203	(group :inline t
171	(list :inline t :tag "dontexpunge"	204	(const :format "" :value :password)
172	(const :value :dontexpunge) boolean)	205	(string :tag "Password"))
173	(list :inline t :tag "plugged"	206	(group :inline t
174	(const :value :plugged) boolean))))))))	207	(const :format ""
		208	:value :dontexpunge)
		209	(boolean :tag "Dontexpunge"))
		210	(group :inline t
		211	(const :format "" :value :plugged)
		212	(boolean :tag "Plugged")))))))
175		213
176	(defcustom mail-source-primary-source nil	214	(defcustom mail-source-primary-source nil
177	"*Primary source for incoming mail.	215	"*Primary source for incoming mail.
@@ -234,7 +272,7 @@ Common keywords should be listed here.")
234	(:prescript-delay)	272	(:prescript-delay)
235	(:postscript)	273	(:postscript)
236	(:path (or (getenv "MAIL")	274	(:path (or (getenv "MAIL")
237	(concat "/usr/spool/mail/" (user-login-name)))))	275	(expand-file-name (user-login-name) rmail-spool-directory))))
238	(directory	276	(directory
239	(:path)	277	(:path)
240	(:suffix ".spool")	278	(:suffix ".spool")
@@ -811,12 +849,12 @@ This only works when `display-time' is enabled."
811	user (or (cdr (assoc from mail-source-password-cache))	849	user (or (cdr (assoc from mail-source-password-cache))
812	password) buf)	850	password) buf)
813	(imap-mailbox-select mailbox nil buf))	851	(imap-mailbox-select mailbox nil buf))
814	(let ((coding-system-for-write mail-source-imap-file-coding-system)	852	(let ((coding-system-for-write mail-source-imap-file-coding-system)
815	;; Avoid converting 8-bit chars from inserted strings to
816	;; multibyte.
817	default-enable-multibyte-characters
818	str)	853	str)
819	(with-temp-file mail-source-crash-box	854	(with-temp-file mail-source-crash-box
		855	;; Avoid converting 8-bit chars from inserted strings to
		856	;; multibyte.
		857	(mm-disable-multibyte)
820	;; remember password	858	;; remember password
821	(with-current-buffer buf	859	(with-current-buffer buf
822	(when (or imap-password	860	(when (or imap-password