Change default to 'opportunistic if hashcash is installed.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5ce3acf..75cea21 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2010-09-02  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * message.el (message-generate-hashcash): Change default to
+       'opportunistic if hashcash is installed.
+
        * gnus-html.el (gnus-html-rescale-image): Fix up typo in rescaling.
        (gnus-html-put-image): Only call image-size once, since it's somewhat
        time-consuming on remote X servers.

diff --git a/lisp/message.el b/lisp/message.el
index 2198702..f3697eb 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -1699,13 +1699,14 @@ functionality to work."
                 (const :tag "Never" nil)
                 (const :tag "Always" t)))
 
-(defcustom message-generate-hashcash (if (executable-find "hashcash") t)
+(defcustom message-generate-hashcash (if (executable-find "hashcash") 'opportunistic)
   "*Whether to generate X-Hashcash: headers.
 If t, always generate hashcash headers.  If `opportunistic',
 only generate hashcash headers if it can be done without the user
 waiting (i.e., only asynchronously).
 
 You must have the \"hashcash\" binary installed, see `hashcash-path'."
+  :version "24.1"
   :group 'message-headers
   :link '(custom-manual "(message)Mail Headers")
   :type '(choice (const :tag "Always" t)