* etc/icons/wl-draft-save-and-exit-up.xpm: Modified.

[elisp/wanderlust.git] / elmo / elmo-vars.el

diff --git a/elmo/elmo-vars.el b/elmo/elmo-vars.el
index 5ed767f..2a6e0ae 100644 (file)
--- a/elmo/elmo-vars.el
+++ b/elmo/elmo-vars.el
@@ -47,24 +47,24 @@
   :prefix "elmo-"
   :group 'elmo)
 
-;; Local
-(defvar elmo-localnews-folder-path "~/News"
-  "*Local news folder path.")
-(defvar elmo-maildir-folder-path "~/Maildir"
-  "*Maildir folder path.")
-(defvar elmo-maildir-list '("\\+~/Maildir")
-  "*All Folders that match this list will be treated as Maildir.
-Each elements are regexp of folder name (This is obsolete).")
+;; Message Database
 
 (defvar elmo-msgdb-file-header-chop-length 2048
   "*Number of bytes to get header in one reading from file.")
 
-(defvar elmo-msgdb-dir "~/.elmo"
-  "*ELMO Message Database path.")
+(defcustom elmo-msgdb-directory "~/.elmo"
+  "*ELMO Message Database path."
+  :type 'directory
+  :group 'elmo
+  :group 'elmo-setting)
 (defvar elmo-passwd-alist-file-name "passwd"
   "*ELMO Password filename.")
-(defvar elmo-passwd-life-time nil
-  "*Duration of ELMO Password in seconds.  nil means infinity.")
+(defcustom elmo-passwd-life-time nil
+  "*Duration of ELMO Password in seconds.  nil means infinity."
+  :type '(choice (const :tag "Infinity" nil)
+                number)
+  :group 'elmo
+  :group 'elmo-setting)
 
 (defvar elmo-warning-threshold 30000
   "*Display warning when the bytes of message exceeds this value.")
@@ -92,7 +92,12 @@ Each elements are regexp of folder name (This is obsolete).")
 
 (defcustom elmo-imap4-default-authenticate-type 'login
   "*Default Authentication type for IMAP4."
-  :type 'symbol
+  :type '(radio (const :tag "encoded password transmission (login)" login)
+               (const :tag "CRAM-MD5 authentication (cram-md5)" cram-md5)
+               (const :tag "DIGEST-MD5 authentication (digest-md5)" digest-md5)
+               (const :tag "plain password transmission (clear)" clear)
+               (const :tag "NTLM authentication (ntlm)" ntlm)
+               (function :tag "Other"))
   :group 'elmo)
 
 (defcustom elmo-imap4-default-user (or (getenv "USER")
@@ -131,7 +136,8 @@ This is taken precedence over `elmo-network-stream-type-alist'.")
 
 (defcustom elmo-nntp-default-user nil
   "*Default User of NNTP.  nil means no user authentication."
-  :type 'string
+  :type '(choice (const nil)
+                string)
   :group 'elmo
   :group 'elmo-setting)
 
@@ -171,7 +177,12 @@ This is taken precedence over `elmo-network-stream-type-alist'.")
 
 (defcustom elmo-pop3-default-authenticate-type 'user
   "*Default Authentication type for POP3."
-  :type 'symbol
+  :type '(radio (const :tag "plain password transmission (user)" user)
+               (const :tag "APOP authentication (apop)" apop)
+               (const :tag "CRAM-MD5 authentication (cram-md5)" cram-md5)
+               (const :tag "DIGEST-MD5 authentication (digest-md5)" digest-md5)
+               (const :tag "NTLM authentication (ntlm)" ntlm)
+               (function :tag "Other"))
   :group 'elmo)
 
 (defcustom elmo-pop3-default-port 110
@@ -231,11 +242,17 @@ For disconnected operations.")
 (defvar elmo-strict-diff-folder-list nil
   "List of regexps of folder name which should be checked its diff strictly.")
 
-(defvar elmo-msgdb-extra-fields nil
-  "Extra fields for msgdb.")
+(defcustom elmo-msgdb-extra-fields nil
+  "Extra fields for msgdb."
+  :type '(repeat string)
+  :group 'elmo
+  :group 'elmo-setting)
 
-(defvar elmo-enable-disconnected-operation t
-  "*Enable disconnected operations.")
+(defcustom elmo-enable-disconnected-operation t
+  "*Non-nil enables disconnected operations."
+  :type 'boolean
+  :group 'elmo
+  :group 'elmo-setting)
 
 (defvar elmo-auto-change-plugged 600
   "*Time to expire change plugged state automatically, as the number of seconds.
@@ -321,7 +338,7 @@ Arguments for this function are NAME, BUFFER, HOST and SERVICE.")
 (defvar elmo-cache-expire-default-age 50
   "Cache expiration age (days).")
 
-(defvar elmo-cache-dirname "cache"
+(defvar elmo-cache-directory (expand-file-name "cache" elmo-msgdb-directory)
   "Directory name for cache storage.")
 
 (defvar elmo-pack-number-check-strict t