(elmo-flatten): Use `append' and `listp' instead of

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

diff --git a/elmo/elmo-vars.el b/elmo/elmo-vars.el
index 88d36b4..160fea5 100644 (file)
--- a/elmo/elmo-vars.el
+++ b/elmo/elmo-vars.el
@@ -73,14 +73,14 @@ you have to add it to `elmo-digest-flags'.
 
 ;; Message Database
 
-(defcustom elmo-msgdb-default-type 'legacy
+(defcustom elmo-msgdb-default-type 'standard
   "*Default type of Message Database for ELMO."
   :type '(radio (const legacy)
                (const standard))
   :group 'elmo
   :group 'elmo-setting)
 
-(defcustom elmo-msgdb-convert-type nil
+(defcustom elmo-msgdb-convert-type 'auto
   "*MODB conversion type."
   :type '(radio (const sync)
                (const auto)
@@ -278,6 +278,13 @@ For disconnected operations.")
 (defvar elmo-strict-diff-folder-list nil
   "List of regexps of folder name which should be checked its diff strictly.")
 
+(defcustom elmo-msgdb-prefer-in-reply-to-for-parent nil
+  "*Non-nil to prefer In-Reply-To header for finding parent message on thread,
+rather than References header."
+  :type 'boolean
+  :group 'elmo
+  :group 'elmo-setting)
+
 (defcustom elmo-msgdb-extra-fields nil
   "Extra fields for msgdb."
   :type '(repeat string)
@@ -435,6 +442,43 @@ Arguments for this function are NAME, BUFFER, HOST and SERVICE.")
   :type 'symbol
   :group 'elmo)
 
+(defcustom elmo-mailing-list-name-spec-list
+  '(x-ml-name
+    (x-sequence "^\\([^ ]+\\)")
+    (subject "^\\s(\\(\\S)+\\)[ :][0-9]+\\s)[ \t]*")
+    (list-post "<mailto:\\(.+\\)@")
+    (list-id "<\\([^.]+\\)\\." "^\\([^.]+\\)\\.")
+    (mailing-list ("\\(^\\|; \\)contact \\([^@]+\\)-[^-@]+@" . 2))
+    (return-path "^<\\([^@>]+\\)-return-[0-9]+-")
+    (delivered-to "^mailing list \\([^@]+\\)@"))
+  "*List of spec to extract mailing list name from field value."
+  :type '(repeat
+         (choice (symbol :tag "Field Name")
+                 (list (symbol :tag "Field Name")
+                       (repeat
+                        :inline symbol
+                        (choice regexp
+                                (cons regexp
+                                      (integer :tag "Match Index")))))))
+  :group 'elmo)
+
+(defcustom elmo-mailing-list-count-spec-list
+  '(x-mail-count
+    x-ml-count
+    (x-sequence "^[^ ]+ \\([^ ]+\\)")
+    (subject "^\\s(\\S)+[ :]\\([0-9]+\\)\\s)[ \t]*")
+    (return-path "^<[^@>]+-return-\\([0-9]+\\)-"))
+  "*List of spec to extract mailing list count from field value."
+  :type '(repeat
+         (choice (symbol :tag "Field Name")
+                 (list (symbol :tag "Field Name")
+                       (repeat
+                        :inline symbol
+                        (choice regexp
+                                (cons regexp
+                                      (integer :tag "Match Index")))))))
+  :group 'elmo)
+
 (require 'product)
 (product-provide (provide 'elmo-vars) (require 'elmo-version))