Synch to No Gnus 200412160112.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5498934..417c6ac 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-16  Simon Josefsson  <jas@extundo.com>
+
+       * hashcash.el (hashcash-payment-alist): Fix custom :type.
+
 2004-12-15  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * mm-url.el (mm-url-predefined-programs): Add --silent arg to curl.

diff --git a/lisp/hashcash.el b/lisp/hashcash.el
index c0a799d..68a5cfd 100644 (file)
--- a/lisp/hashcash.el
+++ b/lisp/hashcash.el
@@ -63,7 +63,14 @@ See `hashcash-payment-alist'."
 Elements may consist of (ADDR AMOUNT) or (ADDR STRING AMOUNT), where
 ADDR is the email address of the intended recipient and AMOUNT is
 the value of hashcash payment to be made to that user.  STRING, if
-present, is the string to be hashed; if not present ADDR will be used.")
+present, is the string to be hashed; if not present ADDR will be used."
+  :type '(repeat (choice (list :tag "Normal"
+                              (string :name "Address")
+                              (integer :name "Amount"))
+                        (list :tag "Replace hash input"
+                              (string :name "Address")
+                              (string :name "Hash input")
+                              (integer :name "Amount")))))
 
 (defcustom hashcash-default-accept-payment 20
   "*The default minimum number of bits to accept on incoming payments."