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 5484c81..6a7d702 100644 (file)
--- a/wl/wl-vars.el
+++ b/wl/wl-vars.el
@@ -201,7 +201,7 @@ If no match, `wl-summary-default-view' is used."
                                    wl-summary-buffer-elmo-folder))
          (elmo-folder-name-internal wl-summary-buffer-elmo-folder)))
     (?t (if (eq wl-summary-buffer-view 'thread) "T" "S"))
-    (?m (if wl-summary-buffer-display-as-is "-" "M"))
+    (?m (upcase (symbol-name wl-summary-buffer-display-mime-mode)))
     (?n wl-summary-buffer-new-count)
     (?u wl-summary-buffer-unread-count)
     (?a (length wl-summary-buffer-number-list)))
@@ -218,7 +218,7 @@ 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)
 
@@ -526,13 +528,15 @@ If nil, `wl-from' is used."
 
 (defcustom wl-draft-add-in-reply-to t
   "*If non-nil, message-id of the cited message is inserted to the
-in-reply-to field of the current draft."
+in-reply-to field of the current draft.
+Note: default value follows RFC2822."
   :type 'boolean
   :group 'wl)
 
 (defcustom wl-draft-add-references nil
   "*If non-nil, message-id of the cited message is inserted to the
-references field of the current draft."
+references field of the current draft.
+Note: default value follows RFC2822."
   :type 'boolean
   :group 'wl)
 
@@ -590,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.
@@ -1104,6 +1116,17 @@ Example:
   :type '(repeat string)
   :group 'wl-summary)
 
+(defcustom wl-summary-display-mime-mode-list '(mime as-is)
+  "*Display mime mode list toggled by `wl-summary-toggle-mime'.
+Candidates are following:
+`mime'        ... header and body are decoded
+`header-only' ... only header is decoded
+`as-is'       ... header and body are not decoded"
+  :type '(repeat (choice (const :tag "MIME"       mime)
+                        (const :tag "HEADER-ONLY" header-only)
+                        (const :tag "AS-IS"       as-is)))
+  :group 'wl-summary)
+
 (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
@@ -1645,8 +1668,10 @@ 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))
-    (?m (if (get-text-property (point-min) 'mime-view-entity)
-           "MIME" "AS-IS"))
+    (?m (upcase (symbol-name
+                (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.
@@ -1894,7 +1919,7 @@ with wl-highlight-folder-many-face."
                (string :tag "Other"))
   :group 'wl-summary)
 
-(defcustom wl-mime-charset 'x-ctext
+(defcustom wl-mime-charset (if wl-on-mule 'x-ctext 'iso-8859-1)
   "*MIME Charset for summary and message."
   :type 'symbol
   :group 'wl-summary
@@ -1950,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."