This commit was manufactured by cvs2svn to create branch 'elmo-imap4-new-

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

diff --git a/wl/wl-vars.el b/wl/wl-vars.el
index 329754e..568be98 100644 (file)
--- a/wl/wl-vars.el
+++ b/wl/wl-vars.el
@@ -41,12 +41,12 @@
 (defgroup wl nil
   "Wanderlust, a news and mail reading software."
   :tag "Wanderlust"
-  :link (` (custom-manual
-           (, (if (and (boundp 'current-language-environment)
-                       (string-equal "Japanese"
-                                     (symbol-value 'current-language-environment)))
-                  "(wl-ja)Top"
-                "(wl)Top"))))
+  :link `(custom-manual
+         ,(if (and (boundp 'current-language-environment)
+                   (string-equal "Japanese"
+                                 (symbol-value 'current-language-environment)))
+              "(wl-ja)Top"
+            "(wl)Top"))
   :group 'news
   :group 'mail)
 
@@ -274,6 +274,7 @@ which are replaced by the given information:
 %D The day of the date field of the message (zero padded).
 %W The weekday name of the date field of the message (zero padded).
 %h The hour of the date field of the message (zero padded).
+%l The number in the mailing list.
 %m The minute of the date field of the message (zero padded).
 %[ An open bracket.  If the message thread is linked,
    it is replaced with '<'.
@@ -287,7 +288,10 @@ which are replaced by the given information:
 %f The from: field string of the message.
 %s The subject: field string of the message.
 %S The size of the message (if available).
+%t The branch of the thread.
+%@ `@' only if the first MIME part is multipart/mixed.
 %~ If the previous spec is not zero-length, replaced with ' '.
+%#  mailing list information (`(' ML-name [ ` ' ML-number ] `)')
 
 If the format string contains the specifiers %( and %), the text between
 them will have the specified number of columns.
@@ -1774,12 +1778,12 @@ This variable overwhelm `wl-message-ignored-field-list' settings."
   :group 'wl-setting)
 
 (defcustom wl-message-header-button-alist
-  (` (("^\\(References\\|Message-Id\\|In-Reply-To\\):"
-       "<[^>\n ]+>"
-       0 wl-message-button-refer-article  0)
-      ("^[^:]+:"
-       "\\(<\\(url: \\)?news:\\([^>\n ]*\\)>\\)"
-       1 wl-message-button-refer-article 3)))
+  '(("^\\(References\\|Message-Id\\|In-Reply-To\\):"
+     "<[^>\n ]+>"
+     0 wl-message-button-refer-article  0)
+    ("^[^:]+:"
+     "\\(<\\(url: \\)?news:\\([^>\n ]*\\)>\\)"
+     1 wl-message-button-refer-article 3))
   "Alist of headers and regexps to match buttons in message headers."
   :type '(repeat
          (list (regexp :tag "Header")
@@ -2154,33 +2158,33 @@ Each elements are regexp of folder name."
 (defcustom wl-show-plug-status-on-modeline t
   "If it is non-nil, show plugged status in modeline."
   :type 'boolean
-  :group 'wl-highlight)
+  :group 'wl-setting)
 
 (defcustom wl-plug-state-indicator-on  " [ON] "
   "String used to show plugged status ON."
   :type 'string
-  :group 'wl-highlight)
+  :group 'wl-setting)
 
 (defcustom wl-plug-state-indicator-off " [--] "
   "String used to show plugged status OFF."
   :type 'string
-  :group 'wl-highlight)
+  :group 'wl-setting)
 
 (defcustom wl-biff-check-folder-list nil
-  "All folders that match this list are automatically checked
-every intervals specified by wl-biff-check-interval."
-  :type '(repeat (regexp :tag "Folder"))
-  :group 'wl-highlight)
+  "All folders that include this list are automatically checked
+every intervals specified by `wl-biff-check-interval'."
+  :type '(repeat (string :tag "Folder"))
+  :group 'wl-setting)
 
 (defcustom wl-biff-check-interval 40
   "Number of seconds between updates of new mails in the mode line."
   :type 'integer
-  :group 'wl-highlight)
+  :group 'wl-setting)
 
 (defcustom wl-biff-use-idle-timer nil
   "Non-nil to use idle timer instead of strict timer for wl-biff"
   :type 'boolean
-  :group 'wl-highlight)
+  :group 'wl-setting)
 
 (defcustom wl-biff-state-indicator-on (if (and (featurep 'xemacs)
                                               (not (featurep 'mule)))
@@ -2193,7 +2197,7 @@ every intervals specified by wl-biff-check-interval."
                                           'iso-2022-jp)))
   "String used to show biff status ON."
   :type 'string
-  :group 'wl-highlight)
+  :group 'wl-setting)
 
 (defcustom wl-biff-state-indicator-off (if (and (featurep 'xemacs)
                                                (not (featurep 'mule)))
@@ -2202,7 +2206,7 @@ every intervals specified by wl-biff-check-interval."
                                         "[\e$B!>\e(B]")
   "String used to show biff status OFF."
   :type 'string
-  :group 'wl-highlight)
+  :group 'wl-setting)
 
 (defcustom wl-mode-line-display-priority-list '(biff plug title)
   "Displaying order of items to be shown in modeline.  The first item will
@@ -2221,7 +2225,7 @@ even if the value of this option is set to nil.  Here are some samples:
   :type '(repeat (radio (const :format "%v " biff)
                        (const :format "%v " plug)
                        (sexp :tag "Other" :value title)))
-  :group 'wl-highlight)
+  :group 'wl-setting)
 
 (defcustom wl-interactive-send t
   "*If non-nil, require your confirmation when sending draft message."