(wl-mime-pgp-verify-region-with-epg): Follow the API

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

diff --git a/wl/wl-vars.el b/wl/wl-vars.el
index a6e90aa..3079425 100644 (file)
--- a/wl/wl-vars.el
+++ b/wl/wl-vars.el
@@ -727,6 +727,12 @@ when `wl-prefetch-confirm' is non-nil."
   :type 'boolean
   :group 'wl-summary)
 
+(defcustom wl-additional-search-condition-fields nil
+  "*A list of field name which is used for candidates of search condition."
+  :type '(repeat (string :tag "Field name"))
+  :group 'wl-pref
+  :group 'wl-setting)
+
 ;;;; Hooks
 (defvar wl-folder-mode-hook nil
   "A hook called when wanderlust folder mode is started.
@@ -1215,7 +1221,7 @@ In sync-all or rescan."
 
 (defcustom wl-score-files-directory (concat elmo-msgdb-directory elmo-path-sep)
   "*Name of the directory where score files will be stored.
-(default \"~/.elmo\")."
+\(default \"~/.elmo\")."
   :type 'directory
   :group 'wl)
 
@@ -2930,6 +2936,41 @@ a symbol `bitmap', `xbm' or `xpm' in order to force the image format."
   :type 'string
   :group 'wl-pref)
 
+(defcustom wl-use-pgp-module
+  (condition-case nil
+      (progn
+       (require 'epg-config)
+       (epg-check-configuration (epg-configuration))
+       'epg)
+    (error 'pgg))
+  "*Which PGG library to be used."
+  :type '(choice (const :tag "EasyPG Library" epg)
+                (const :tag "PGG Library" pgg)
+                (const :tag "Don't use PGP" nil))
+  :group 'wl-pref)
+
+(defcustom wl-display-progress-threshold
+  '((wl-folder-insert-entity . 100)
+    (elmo-retrieve-message . 3000)
+    (t . 20))
+  "*Displaying progress message if number of total are more than this value."
+  :type '(choice (const :tag "No display" nil)
+                (const :tag "No limitation" 0)
+                (integer :tag "For all")
+                (repeat :tag "Each label"
+                        (cons (choice (const :tag "Default" t)
+                                      (symbol :tag "Label"))
+                              (choice (const :tag "No display" nil)
+                                      (const :tag "No limitation" 0)
+                                      (integer :tag "Threshold")))))
+  :group 'wl-pref)
+
+(defcustom wl-display-progress-function #'wl-simple-display-progress
+  "*A function to display progress message"
+  :type '(choice (const :tag "No display" nil)
+                (function :tag "Function"))
+  :group 'wl-pref)
+
 ;;; Internal variables
 (defvar wl-init nil)