Synch up with main trunk, and prepare the release 2.12.0.

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

diff --git a/wl/wl-vars.el b/wl/wl-vars.el
index 59da329..6a7d702 100644 (file)
--- a/wl/wl-vars.el
+++ b/wl/wl-vars.el
@@ -211,14 +211,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-summary-mode-line-format "Wanderlust: %f {%t}(%n/%u/%a)[%m]"
+(defcustom wl-summary-mode-line-format "Wanderlust: %f {%t}(%n/%u/%a)"
   "*A format string for summary mode-line of Wanderlust.
 It may include any of the following format specifications
 which are replaced by the given information:
 
 %f The folder name.
 %t The thread status of the summary ('T' for thread, 'S' for sequential).
-%m The mime analysis status of the summary ('M' for MIME ON)
+%m The mime analysis status of the summary ('MIME' for MIME ON)
 %n The number of new messages.
 %u The number of unread messages (includes new messages).
 %a The number of all messages."
@@ -290,7 +290,9 @@ which are replaced by the given information:
 %~ If the previous spec is not zero-length, replaced with ' '.
 
 If the format string contains the specifiers %( and %), the text between
-them will have the specified number of columns."
+them will have the specified number of columns.
+
+See also variable `wl-summary-width'."
   :group 'wl-summary
   :type 'string)
 
@@ -592,6 +594,14 @@ If nil, don't authenticate."
   :group 'wl
   :group 'wl-setting)
 
+(defcustom wl-smtp-authenticate-realm nil
+  "*SMTP Authentication realm.
+If you don't need to specify realm, set as nil."
+  :type '(choice (const :tag "none" nil)
+                string)
+  :group 'wl
+  :group 'wl-setting)
+
 (defcustom wl-pop-before-smtp-user nil
   "*POP3 user name to send mail using POP-before-SMTP.
 If nil, `elmo-pop3-default-user' is used.
@@ -1659,8 +1669,9 @@ which appear just before @."
            (wl-folder-get-petname wl-message-buffer-cur-folder)
          wl-message-buffer-cur-folder))
     (?m (upcase (symbol-name
-                (get-text-property (point-min)
-                                   'wl-message-display-mime-mode))))
+                (wl-message-display-type-property
+                 wl-message-buffer-cur-display-type
+                 :mime))))
     (?F wl-message-buffer-flag-indicator)
     (?n wl-message-buffer-cur-number))
   "An alist of format specifications for message buffer's mode-lines.
@@ -1964,6 +1975,13 @@ This wrapper is generated by the mail system when rejecting a letter."
   :type 'regexp
   :group 'wl-draft)
 
+(defcustom wl-auto-save-drafts-interval 1
+  "Idle interval in seconds to save draft buffers automatically.
+If you don't want to use this feature, set this to nil."
+  :type '(choice (const :tag "Don't use this feature" nil)
+                (number :tag "Secs"))
+  :group 'wl-draft)
+
 (defcustom wl-draft-preview-attributes t
   "Non-nil forces to preview the attributes in the `wl-draft-preview-message'.
 Attributes specified in the `wl-draft-preview-attributes-list' are displayed."