* wl-acap.el (wl-acap-original-msgdb-directory): Renamed from

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

diff --git a/wl/wl-vars.el b/wl/wl-vars.el
index f6bf3cd..eb57167 100644 (file)
--- a/wl/wl-vars.el
+++ b/wl/wl-vars.el
@@ -158,18 +158,18 @@ If you don't have multiple e-mail addresses, you don't have to set this."
   :group 'wl
   :group 'wl-setting)
 
-(defcustom wl-tmp-dir "~/tmp/"
+(defcustom wl-temporary-file-directory "~/tmp/"
   "*Default temporary directory to save message, part."
   :type 'directory
   :group 'wl)
 
-(defcustom wl-icon-dir (if (fboundp 'locate-data-directory)
-                          (locate-data-directory "wl")
-                        (let ((icons (expand-file-name "wl/icons/"
-                                                       data-directory)))
-                          (if (file-directory-p icons)
-                              icons)))
-  "*Icon directory (XEmacs or Emacs 21)."
+(defcustom wl-icon-directory (if (fboundp 'locate-data-directory)
+                                (locate-data-directory "wl")
+                              (let ((icons (expand-file-name "wl/icons/"
+                                                             data-directory)))
+                                (if (file-directory-p icons)
+                                    icons)))
+  "*Directory to load the icon files from, or nil if none."
   :type '(choice (const :tag "none" nil)
                 string)
   :group 'wl)
@@ -195,13 +195,6 @@ If you don't have multiple e-mail addresses, you don't have to set this."
   :type 'string
   :group 'wl-summary)
 
-(defcustom wl-summary-update-confirm-threshold 500
-  "*Confirm updating summary if message number is larger than this value.
-If nil, all the message will be updated without confirmation."
-  :type '(choice (const :tag "Never confirm" nil)
-                integer)
-  :group 'wl-summary)
-
 ;; Important folders
 (defcustom wl-default-folder "%inbox"
   "*Default folder used in `wl-summary-goto-folder'."
@@ -394,12 +387,6 @@ If nil, `elmo-nntp-default-stream-type' is used."
   :type 'boolean
   :group 'wl)
 
-(defcustom wl-fetch-confirm-threshold 30000
-  "*Confirm fetching if message size is larger than this value."
-  :type 'integer
-  :group 'wl-pref
-  :group 'wl-setting)
-
 (defcustom wl-prefetch-confirm t
   "*Confirm prefetching if message size is larger than `wl-prefetch-threshold'."
   :type 'boolean
@@ -841,7 +828,7 @@ In sync-all or rescan."
   :type 'integer
   :group 'wl-score)
 
-(defcustom wl-score-files-dir (concat elmo-msgdb-dir elmo-path-sep)
+(defcustom wl-score-files-directory (concat elmo-msgdb-directory elmo-path-sep)
   "*Name of the directory where score files will be stored.
 (default \"~/.elmo\")."
   :type 'directory
@@ -1327,8 +1314,9 @@ with wl-highlight-folder-many-face."
   :group 'wl-pref)
 
 (defcustom wl-summary-indent-length-limit 46
-  "*Limit of indent length for thread."
-  :type 'integer
+  "*Limit of indent length for thread. Nil means unlimited"
+  :type '(choice (const :tag "Unlimited" nil)
+                integer)
   :group 'wl-summary
   :group 'wl-pref)
 
@@ -1368,13 +1356,13 @@ with wl-highlight-folder-many-face."
                (string :tag "Other"))
   :group 'wl-summary)
 
-(defcustom wl-from-width 17
+(defcustom wl-summary-from-width 17
   "*From width in summary."
   :type 'integer
   :group 'wl-summary
   :group 'wl-pref)
 
-(defcustom wl-subject-length-limit 35
+(defcustom wl-summary-subject-length-limit nil
   "*Set subject width in summary when wl-summary-width is nil.
 Nil means unlimited"
   :type '(choice (const :tag "Unlimited" nil)
@@ -2284,7 +2272,7 @@ a symbol `bitmap', `xbm' or `xpm' in order to force the image format."
 (defvar wl-highlight-thread-indent-string-regexp "[^[<]*"
   "* A regexp string for thread indent...for highlight.")
 
-;; folder icons. filename relative to wl-icon-dir
+;; folder icons. filename relative to wl-icon-directory
 (defvar wl-opened-group-folder-icon "opened.xpm"
   "*Icon file for opened group folder.")
 (defvar wl-closed-group-folder-icon "closed.xpm"
@@ -2348,6 +2336,27 @@ a symbol `bitmap', `xbm' or `xpm' in order to force the image format."
 
 ;;;; Obsolete variables.
 
+;; 2001-12-11: *-dir -> *-directory
+(elmo-define-obsolete-variable 'wl-icon-dir
+                              'wl-icon-directory)
+(elmo-define-obsolete-variable 'wl-mime-save-dir
+                              'wl-mime-save-directory)
+(elmo-define-obsolete-variable 'wl-score-files-dir
+                              'wl-score-files-directory)
+(elmo-define-obsolete-variable 'wl-tmp-dir
+                              'wl-teporary-file-directory)
+
+;; 2001-12-10
+(elmo-define-obsolete-variable 'wl-summary-update-confirm-threshold
+                              'elmo-folder-update-threshold)
+(elmo-define-obsolete-variable 'wl-fetch-confirm-threshold
+                              'elmo-message-fetch-threshold)
+
+(elmo-define-obsolete-variable 'wl-cache-prefetch-folder-type-list
+                              'wl-message-buffer-prefetch-folder-type-list)
+(elmo-define-obsolete-variable 'wl-cache-prefetch-folder-list
+                              'wl-message-buffer-prefetch-folder-list)
+
 ;; 2001-02-27: *-func -> *-function
 (elmo-define-obsolete-variable 'wl-summary-from-func
                               'wl-summary-from-function)
@@ -2380,10 +2389,6 @@ a symbol `bitmap', `xbm' or `xpm' in order to force the image format."
 (elmo-define-obsolete-variable 'wl-summary-temp-above
                               'wl-summary-target-above)
 
-;; 2000-03-08
-(elmo-define-obsolete-variable 'wl-score-files-directory
-                              'wl-score-files-dir)
-
 ;; 1999-11-07: Unified with `wl-draft-config-alist'.
 (defvar wl-draft-prepared-config-alist nil)
 (make-obsolete-variable 'wl-draft-prepared-config-alist