X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=wl%2Fwl-vars.el;h=4f222baa2a5f3f5807565a789738dddcf49ddf69;hb=c50cc4923f2b8db952b90cba5534e12a436b1a5a;hp=bc1825dcd6587bd5dcfb13e3593d6a99c1eb7a93;hpb=01a9c0dce5ba5b72e7daf42602da255681dfba81;p=elisp%2Fwanderlust.git diff --git a/wl/wl-vars.el b/wl/wl-vars.el index bc1825d..4f222ba 100644 --- a/wl/wl-vars.el +++ b/wl/wl-vars.el @@ -181,7 +181,7 @@ If you don't have multiple e-mail addresses, you don't have to set this." :group 'wl-summary) (defcustom wl-summary-default-view-alist nil - "An alist of folder name and summary default view. + "An alist of regexp for folder name and summary default view. If no match, `wl-summary-default-view' is used." :type '(repeat (cons (regexp :tag "Folder Regexp") (choice (const :tag "Thread" thread) @@ -200,7 +200,7 @@ If no match, `wl-summary-default-view' is used." (?a (length wl-summary-buffer-number-list))) "An alist of format specifications that can appear in summary mode-lines. Each element is a list of following: -\(SPEC STRING-EXP\) +\(SPEC STRING-EXP) SPEC is a character for format specification. STRING-EXP is an expression to get string to insert.") @@ -247,7 +247,7 @@ which are replaced by the given information: (?@ (wl-summary-line-attached))) "An alist of format specifications that can appear in summary lines. Each element is a list of following: -\(SPEC STRING-EXP\) +\(SPEC STRING-EXP) SPEC is a character for format specification. STRING-EXP is an expression to get string to insert.") @@ -325,8 +325,10 @@ It is highly recommended to set this value to t." (defcustom wl-summary-search-parent-by-subject-regexp "^[ \t]*\\(\\[[^:]+[,: ][0-9]+\\]\\)?[ \t]*re[\\^[:> ]" "*If message does not have in-reply-to field nor references field and - subject matches this regexp, search parent message by subject matching." - :type 'string +subject matches this regexp, search parent message by subject matching. +If nil, never search search parent by subject." + :type '(choice string + (const :tag "Don't search parent" nil)) :group 'wl-summary) ;; Important folders @@ -473,7 +475,7 @@ If nil, don't authenticate." "*POP3 user name to send mail using POP-before-SMTP. If nil, `elmo-pop3-default-user' is used. To use POP-before-SMTP, -\(setq wl-draft-send-mail-function 'wl-draft-send-mail-with-pop-before-smtp\)" +\(setq wl-draft-send-mail-function 'wl-draft-send-mail-with-pop-before-smtp)" :type '(choice (const :tag "none" nil) string) :group 'wl @@ -740,7 +742,7 @@ Prepared candidates are 'wl-draft-send-mail-with-smtp, ("Mail-Reply-To" . (("Mail-Reply-To") nil nil)) ("From" . (("From") nil nil))) "Alist of cons cell of -('field-name' . ('fields for To' 'fields for Cc' 'fields for Newsgroups')) +\('field-name' . ('fields for To' 'fields for Cc' 'fields for Newsgroups')) 'field-name' is a string. 'fields for ***' is a list of strings. If car of each cons cell exists in original message, @@ -759,7 +761,7 @@ Default is for 'reply-to-author'." ("Reply-To" . (("Reply-To") ("To" "Cc" "From") ("Newsgroups"))) ("From" . (("From") ("To" "Cc") ("Newsgroups")))) "Alist of cons cell of -('field-name' . ('fields for To' 'fields for Cc' 'fields for Newsgroups')) +\('field-name' . ('fields for To' 'fields for Cc' 'fields for Newsgroups')) 'field-name' is a string. 'fields for ***' is a list of strings. If car of each cons cell exists in original message, @@ -777,7 +779,7 @@ Default is for 'reply-to-all'." ("Newsgroups" . (("To") ("Cc") ("Newsgroups"))) ("From" . (("To") ("Cc") nil))) "Alist of cons cell of -('field-name' . ('fields for To' 'fields for Cc' 'fields for Newsgroups')) +\('field-name' . ('fields for To' 'fields for Cc' 'fields for Newsgroups')) 'field-name' is a string. 'fields for ***' is a list of strings. If car of each cons cell exists in original message, @@ -795,7 +797,7 @@ Default is for 'reply-to-me'." ("Newsgroups" . (("To") ("Cc") ("Newsgroups"))) ("From" . (("To") ("Cc") nil))) "Alist of cons cell of -('field-name' . ('fields for To' 'fields for Cc' 'fields for Newsgroups')) +\('field-name' . ('fields for To' 'fields for Cc' 'fields for Newsgroups')) 'field-name' is a string. 'fields for ***' is a list of strings. If car of each cons cell exists in original message, @@ -860,9 +862,10 @@ Default is for 'followup-to-me'." :type 'file :group 'wl) -(defcustom wl-ldap-server "localhost" +(defcustom wl-ldap-server nil "*LDAP server." - :type '(string :tag "Server") + :type '(choice (const :tag "Default server(localhost)" nil) + (string :tag "Server")) :group 'wl :group 'wl-setting) @@ -873,15 +876,10 @@ Default is for 'followup-to-me'." :group 'wl :group 'wl-setting) -(defcustom wl-ldap-base "c=US" +(defcustom wl-ldap-base nil "*LDAP base." - :type '(string :tag "Base") - :group 'wl - :group 'wl-setting) - -(defcustom wl-ldap-objectclass "person" - "*LDAP objectclass." - :type 'string + :type '(choice (const :tag "Default base" nil) + (string :tag "Base")) :group 'wl :group 'wl-setting) @@ -942,7 +940,7 @@ Default is for 'followup-to-me'." (defcustom wl-summary-fix-timezone nil "*Time zone of the date string in summary mode. If nil, it is adjust to the default time zone information -\(system's default time zone or environment variable TZ\)." +\(system's default time zone or environment variable TZ)." :type '(choice (const :tag "Default time zone" nil) string) :group 'wl-summary) @@ -1361,7 +1359,11 @@ Allowed situations are: :type '(repeat (cons (string :tag "Realname") (string :tag "Petname"))) :group 'wl-folder) -(defcustom wl-summary-weekday-name-lang "ja" +(defcustom wl-summary-weekday-name-lang + (if (and (boundp 'current-language-environment) + (string-equal "Japanese" + (symbol-value 'current-language-environment))) + "ja" "en") "*Language to display week day." :type '(choice (const "ja") (const "en") @@ -1400,6 +1402,27 @@ which appear just before @." :type 'boolean :group 'wl-pref) +(defvar wl-message-mode-line-format-spec-alist + '((?f (if (memq 'modeline wl-use-folder-petname) + (wl-folder-get-petname wl-message-buffer-cur-folder) + wl-message-buffer-cur-folder)) + (?n wl-message-buffer-cur-number)) + "An alist of format specifications for message buffer's mode-lines. +Each element is a list of following: +\(SPEC STRING-EXP) +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 >>" + "*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." + :group 'wl-pref + :type 'string) + (defcustom wl-message-truncate-lines default-truncate-lines "*Truncate lines in Message Buffer." :type 'boolean @@ -1602,14 +1625,6 @@ with wl-highlight-folder-many-face." (string :tag "Other")) :group 'wl-summary) -(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) - integer) - :group 'wl-summary - :group 'wl-pref) - (defcustom wl-mime-charset 'x-ctext "*MIME Charset for summary and message." :type 'symbol @@ -1886,7 +1901,7 @@ See also variable `wl-summary-next-no-unread-command'." :group 'wl-pref :group 'wl-setting) -(defcustom wl-message-buffer-prefetch-folder-type-list t +(defcustom wl-message-buffer-prefetch-folder-type-list '(imap4 nntp) "*All folder types that match this list prefetch next message, and reserved buffer cache." :type `(choice (const :tag "all" t) @@ -1912,12 +1927,12 @@ e.x. :type '(repeat (regexp :tag "Folder Regexp")) :group 'wl-pref) -(defcustom wl-message-buffer-prefetch-depth 3 +(defcustom wl-message-buffer-prefetch-depth 1 "*Depth of buffer prefetch in summary mode." :type 'integer :group 'wl-pref) -(defcustom wl-message-buffer-prefetch-idle-time 0.2 +(defcustom wl-message-buffer-prefetch-idle-time 1 "*Idle time of buffer prefetch." :type 'number :group 'wl-pref) @@ -1984,7 +1999,7 @@ e.x. ("^-han\\." . (2 "+" "+" "|" "-" " "))) "Thread indent set alist. If no match, following indent set is used. -(wl-thread-indent-level +\(wl-thread-indent-level wl-thread-have-younger-brother-str wl-thread-youngest-child-str wl-thread-vertical-str @@ -2628,10 +2643,6 @@ a symbol `bitmap', `xbm' or `xpm' in order to force the image format." (elmo-define-obsolete-variable 'wl-tmp-dir 'wl-temporary-file-directory) -;; 2001-12-07 -(elmo-define-obsolete-variable 'wl-subject-length-limit - 'wl-summary-subject-length-limit) - ;; 2001-12-10 (elmo-define-obsolete-variable 'wl-summary-update-confirm-threshold 'elmo-folder-update-threshold)