(hashcash-version, hashcash-insert-payment): patch

from Paul Foley

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index f10609a..4f6586b 100644 (file)
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-11  Teodor Zlatanov  <tzz@lifelogs.com>
+
+       * hashcash.el (hashcash-version, hashcash-insert-payment): patch
+       from Paul Foley
+
 2003-03-07  Simon Josefsson  <jas@extundo.com>
 
        * gnus-idna.el (gnus-idna-to-ascii-rhs-1): Narrow to

diff --git a/contrib/hashcash.el b/contrib/hashcash.el
index 2eb92d0..6f9ee47 100644 (file)
--- a/contrib/hashcash.el
+++ b/contrib/hashcash.el
@@ -1,6 +1,6 @@
 ;;; hashcash.el --- Add hashcash payments to email
 
-;; $Revision: 1.8 $
+;; $Revision: 1.9 $
 ;; Copyright (C) 1997--2002 Paul E. Foley
 ;; Copyright (C) 2003 Free Software Foundation
 
@@ -126,22 +126,20 @@ is used instead.")
   ;;
   ;; Version 1.0 looked like nnnnnrrrrrxxxxxxxxxxxxxxxx
   ;;   This is no longer supported.
-  (if token
-      (cond ((equal (aref token 1) ?:) 1.2)
-           ((equal (aref token 6) ?:) 1.1)
-           (t (error "Unknown hashcash format version")))
-    nil))
+  (cond ((equal (aref token 1) ?:) 1.2)
+       ((equal (aref token 6) ?:) 1.1)
+       (t (error "Unknown hashcash format version"))))
 
 ;;;###autoload
 (defun hashcash-insert-payment (arg)
   "Insert X-Payment and X-Hashcash headers with a payment for ARG"
   (interactive "sPay to: ")
-  (let* ((pay (hashcash-generate-payment (hashcash-payment-to arg)
-                                        (hashcash-payment-required arg)))
-        (version (hashcash-version pay)))
+  (let ((pay (hashcash-generate-payment (hashcash-payment-to arg)
+                                       (hashcash-payment-required arg))))
     (when pay
       (insert-before-markers "X-Payment: hashcash "
-                            (number-to-string version) " " pay "\n")
+                            (number-to-string (hashcash-version pay)) " "
+                            pay "\n")
       (insert-before-markers "X-Hashcash: " pay "\n"))))
 
 ;;;###autoload