Synch to No Gnus 200603270942.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5b42efe..72d7b7b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2006-03-26  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>  (tiny change)
+
+       * message.el (message-resend): Bind message-generate-hashcash to
+       to nil.
+
+2006-03-26  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>  (tiny change)
+
+       * hashcash.el (hashcash-already-paid-p): Bind case-fold-search
+       when searching for already-paid recipients.
+
 2006-03-27  Daiki Ueno  <ueno@unixuser.org>
 
        * pgg-gpg.el: Invoke gpg asynchronous, to avoid querying for

diff --git a/lisp/hashcash.el b/lisp/hashcash.el
index b99a870..9920dcd 100644 (file)
--- a/lisp/hashcash.el
+++ b/lisp/hashcash.el
@@ -210,7 +210,8 @@ Return immediately.  Call CALLBACK with process and result when ready."
   (save-excursion
     (save-restriction
       (message-narrow-to-headers-or-head)
-      (let ((token (message-fetch-field "x-hashcash")))
+      (let ((token (message-fetch-field "x-hashcash"))
+           (case-fold-search t))
        (and (stringp token)
             (string-match (regexp-quote recipient) token))))))
 

diff --git a/lisp/message.el b/lisp/message.el
index bc01bbd..a7e31a0 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -7215,6 +7215,7 @@ Optional NEWS will use news to forward instead of mail."
        (set-buffer (get-buffer-create " *message resend*"))
        (erase-buffer))
       (let ((message-this-is-mail t)
+           message-generate-hashcash
            message-setup-hook)
        (message-setup `((To . ,address))))
       ;; Insert our usual headers.
@@ -7252,7 +7253,8 @@ Optional NEWS will use news to forward instead of mail."
       ;; Send it.
       (let ((message-encoding-buffer (current-buffer))
            (message-edit-buffer (current-buffer))
-           message-required-mail-headers)
+           message-required-mail-headers
+           message-generate-hashcash)
        (message-send-mail))
       (kill-buffer (current-buffer)))
     (message "Resending message to %s...done" address)))