X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=wl%2Fwl-vars.el;h=8d19ee7b74fbcfd89cd8448196a9de55072da91a;hb=a188e316446f771a0900c8e05026e39b224eb0f9;hp=c9d3242a31fac26ef0a22132f62ac5ccb96cd8ad;hpb=7577ad1b6ed9e227ce088a17bf93eda7d4ef0271;p=elisp%2Fwanderlust.git diff --git a/wl/wl-vars.el b/wl/wl-vars.el index c9d3242..8d19ee7 100644 --- a/wl/wl-vars.el +++ b/wl/wl-vars.el @@ -129,9 +129,6 @@ (defvar wl-cs-cache wl-cs-local) -(defvar wl-use-semi (module-installed-p 'mime-view) ; If nil, use tm. - "*Use SEMI or not.") - (defcustom wl-from (and user-mail-address (concat (and (user-full-name) (concat (elmo-address-quote-specials @@ -413,7 +410,8 @@ FACE is a face for highlighting." (symbol :tag "Set mark function") (symbol :tag "Unset mark function") (symbol :tag "Exec function") - (symbol :tag "Face symbol")) + (symbol :tag "Face symbol") + (string :tag "Document string")) :group 'wl-summary) ;; Important folders @@ -436,7 +434,7 @@ FACE is a face for highlighting." :group 'wl) (defcustom wl-default-spec "%" - "*Default spec" + "*Default prefix for folder name initially added in minibuffer" :type 'string :group 'wl) @@ -483,6 +481,23 @@ You had better set this variable if you set 'wl-insert-mail-followup-to' as t." :type 'boolean :group 'wl-pref) +(defcustom wl-demo-icon-name-alist + '(((string-match "^... Dec \\([ 01][0-9]\\|2[0-5]\\)" (current-time-string)) + . + (concat "wl-" (wl-version-status) "-xmas-logo")) + (t + . + (concat "wl-" (wl-version-status) "-logo"))) + "An alist to determine the basename of the logo file." + :type '(repeat (cons (symbol :tag "condition") + (symbol :tag "file name"))) + :group 'wl-pref) + +(defcustom wl-demo-image-filter-alist nil + "An alist of image type and filter function." + :type '(repeat (cons symbol function)) + :group 'wl-pref) + (defcustom wl-envelope-from nil "*Envelope From used in SMTP. If nil, `wl-from' is used." @@ -525,6 +540,7 @@ references field of the current draft." If nil, default smtp connection type is used." :type '(choice (const :tag "default" nil) (const :tag "Use STARTTLS" starttls) + (const :tag "SMTP over SSL" ssl) symbol) :group 'wl) @@ -868,7 +884,7 @@ cdr of each cons cell is used for draft message." :group 'wl-draft) (defcustom wl-draft-always-delete-myself nil - "*Always delete myself from reciepient if non-nil." + "*Always delete myself from recipient if non-nil." :type 'boolean :group 'wl-draft) @@ -956,16 +972,38 @@ cdr of each cons cell is used for draft message." :type 'boolean :group 'wl-folder) -(defcustom wl-summary-flag-priority-list '(new important answered unread) - "List of flags reflected with the priority to a persistent mark." +(defcustom wl-summary-persistent-mark-priority-list '(flag + new + answered + unread) + "List of flags reflected with the priority to persistent marks and faces." :type '(repeat (radio (const :format "%v " new) - (const :format "%v " important) + (const :format "%v " flag) (const :format "%v " answered) (const :format "%v " unread))) :group 'wl-summary) -(defcustom wl-summary-new-mark "N" - "Mark for new message." +(defcustom wl-summary-flag-alist + '((important "orange")) + "An alist to define the flags for the summary mode. +Each element is a form like: +\(SYMBOL-OF-FLAG COLOR\) +Example: +\((important \"orange\"\) + \(todo \"red\"\) + \(business \"green\"\) + \(private \"blue\"\)\)" + :type '(repeat (list (symbol :tag "flag") + (string :tag "color"))) + :group 'wl-summary) + +(defcustom wl-summary-new-uncached-mark "N" + "Mark for new and uncached message." + :type '(string :tag "Mark") + :group 'wl-summary-marks) + +(defcustom wl-summary-new-cached-mark "?" + "Mark for new but already cached message." :type '(string :tag "Mark") :group 'wl-summary-marks) @@ -994,8 +1032,8 @@ cdr of each cons cell is used for draft message." :type '(string :tag "Mark") :group 'wl-summary-marks) -(defcustom wl-summary-important-mark "$" - "Mark for important message." +(defcustom wl-summary-flag-mark "$" + "Mark for the messages which have tags." :type '(string :tag "Mark") :group 'wl-summary-marks) @@ -1059,7 +1097,7 @@ This variable is local to the summary buffers." :group 'wl-score) (defcustom wl-summary-score-marks - (list wl-summary-new-mark) + (list wl-summary-new-uncached-mark wl-summary-new-cached-mark) "Persistent marks to scoring." :type '(repeat (string :tag "Mark")) :group 'wl-score) @@ -1184,7 +1222,8 @@ This can either be a regular expression or list of regular expressions." (defcustom wl-draft-mime-bcc-body nil "Body string for MIME-encapsulated Bcc. If nil, a string `This is a blind carbon copy.' is used." - :type '(string :tag "Body") + :type '(choice (const :tag "default" nil) + (string :tag "Body")) :group 'wl-draft) (defcustom wl-draft-disable-bcc-for-mime-bcc t @@ -1239,7 +1278,10 @@ See also variable `wl-draft-parent-folder'." :group 'wl-draft) (defcustom wl-template-alist nil - "Alist of template." + "Alist of template. +First element of each list is a string specifies the name of the template. +Remaining elements indicate actions. The format of actions is same as that +of `wl-draft-config-alist'." :type '(repeat (list (string :tag "Name") (repeat :inline t @@ -1365,7 +1407,8 @@ You can also set it to a list of setting. (defcustom wl-draft-sendlog-max-size 20000 "*Max file size of sendlog." - :type 'integer + :type '(choice (const :tag "Unlimited" nil) + integer) :group 'wl-draft) (defcustom wl-summary-default-number-column 5 @@ -1547,6 +1590,7 @@ which appear just before @." '((?f (if (memq 'modeline wl-use-folder-petname) (wl-folder-get-petname wl-message-buffer-cur-folder) wl-message-buffer-cur-folder)) + (?F wl-message-buffer-flag-indicator) (?n wl-message-buffer-cur-number)) "An alist of format specifications for message buffer's mode-lines. Each element is a list of following: @@ -1554,13 +1598,14 @@ Each element is a list of following: SPEC is a character for format specification. STRING-EXP is an expression to get string to insert.") -(defcustom wl-message-mode-line-format "Wanderlust: << %f / %n >>" +(defcustom wl-message-mode-line-format "Wanderlust: << %f / %n %F>>" "*A format string for message buffer's mode-line of Wanderlust. It may include any of the following format specifications which are replaced by the given information: %f The folder name. -%n The number of the message." +%n The number of the message. +%F The global flag indicator." :group 'wl-pref :type 'string) @@ -1595,14 +1640,16 @@ which are replaced by the given information: (defcustom wl-message-ignored-field-list nil "All fields that match this list will be hidden in message buffer. -Each elements are regexp of field-name." +Each elements are regexp of field-name. +You can specify exceptions by `wl-message-visible-field-list'." :type '(repeat (string :tag "Field Regexp")) :group 'wl-pref :group 'wl-setting) (defcustom wl-message-visible-field-list nil "All fields that match this list will be displayed in message buffer. -Each elements are regexp of field-name." +Each elements are regexp of field-name. +This variable overwhelm `wl-message-ignored-field-list' settings." :type '(repeat (string :tag "Field Regexp")) :group 'wl-pref :group 'wl-setting) @@ -1698,7 +1745,7 @@ with wl-highlight-folder-many-face." :group 'wl-pref) (defcustom wl-fcc nil - "*Folder Carbon Copy." + "*Folder Carbon Copy target initially added at creating draft buffer." :type '(choice (const :tag "disable" nil) string function) :group 'wl-draft @@ -1711,7 +1758,7 @@ with wl-highlight-folder-many-face." :group 'wl-pref) (defcustom wl-bcc nil - "*Blind Carbon Copy." + "*Blind Carbon Copy target initially added at creating draft buffer." :type '(choice (const :tag "disable" nil) string) :group 'wl-draft @@ -1874,7 +1921,8 @@ Also variables which begin with `wl-' can be specified :group 'wl-pref) (defcustom wl-summary-auto-refile-skip-marks - (list wl-summary-new-mark + (list wl-summary-new-uncached-mark + wl-summary-new-cached-mark wl-summary-unread-uncached-mark wl-summary-unread-cached-mark) "Persistent marks to skip auto-refiling." @@ -1896,7 +1944,7 @@ the message is skipped at cursor move." :group 'wl-summary) (defcustom wl-summary-incorporate-marks - (list wl-summary-new-mark + (list wl-summary-new-uncached-mark wl-summary-unread-uncached-mark) "Persistent marks to prefetch at `wl-summary-incorporate'." :type '(repeat (string :tag "Mark")) @@ -2298,6 +2346,11 @@ Sender information in summary mode." regexp) :group 'wl-summary) +(defcustom wl-summary-save-file-suffix ".eml" + "Suffix for the saved file name." + :type 'string + :group 'wl-summary) + (defcustom wl-folder-removed-mark "#" "Mark for removed folder." :type 'string @@ -2332,18 +2385,8 @@ ex. (string :tag "Folder")))) :group 'wl-folder) -(defcustom wl-refile-policy-alist '(("^[-=']" . copy) - (".*" . move)) - "*List of refile policy. Each element is (FOLDER-REGEXP . POLICY). -POLICY is copy or move." - :type '(repeat (cons (regexp :tag "Folder Regexp") - (choice (const copy) - (const move)))) - :group 'wl-summary - :group 'wl-pref) - (defcustom wl-folder-hierarchy-access-folders '("^-[^\\.]*\\(:\\|@\\|$\\)" - "^@$") + "^@$" "^'$") "*Access group REGEXPs to make hierarchy structure." :type '(repeat (string :tag "Regexp")) :group 'wl-folder) @@ -2485,8 +2528,9 @@ ex. :group 'wl-expire) (defcustom wl-summary-expire-reserve-marks - (list wl-summary-important-mark - wl-summary-new-mark + (list wl-summary-flag-mark + wl-summary-new-uncached-mark + wl-summary-new-cached-mark wl-summary-unread-uncached-mark wl-summary-unread-cached-mark) "Permanent marks of reserved message when expire. @@ -2789,6 +2833,8 @@ a symbol `bitmap', `xbm' or `xpm' in order to force the image format." "*Icon file for namazu folder.") (defvar wl-shimbun-folder-icon "shimbun.xpm" "*Icon file for shimbun folder.") +(defvar wl-file-folder-icon "file.xpm" + "*Icon file for file folder.") (defvar wl-maildir-folder-icon "maildir.xpm" "*Icon file for maildir folder.") (defvar wl-empty-trash-folder-icon "trash-e.xpm" @@ -2824,6 +2870,10 @@ a symbol `bitmap', `xbm' or `xpm' in order to force the image format." ;;;; Obsolete variables. +;; 2003-11-05 +(elmo-define-obsolete-variable 'wl-summary-new-mark + 'wl-summary-new-uncached-mark) + ;; 2003-07-15 delete -> dispose (elmo-define-obsolete-variable 'wl-delete-folder-alist 'wl-dispose-folder-alist)