From: yamaoka <yamaoka>
Date: Sun, 16 Jan 2005 13:49:38 +0000 (+0000)
Subject: Synch to No Gnus 200501161222.
X-Git-Tag: t-gnus-6_17_4-quimby-~592
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=849eaf3d2006e72f4ae945fa09c58496f0c5c789;p=elisp%2Fgnus.git-

Synch to No Gnus 200501161222.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dff0c5e..ce0c29d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2005-01-16  Simon Josefsson  <jas@extundo.com>
+
+	* hashcash.el: Remove non-FSF copyright header.
+
+	* hashcash.el (hashcash-extra-generate-parameters): New variable.
+	(hashcash-generate-payment): Use it.
+	(hashcash-generate-payment-async): Use it.
+
 2005-01-15  Simon Josefsson  <jas@extundo.com>
 
 	* message.el (message-idna-to-ascii-rhs): Decode Reply-To too.
diff --git a/lisp/hashcash.el b/lisp/hashcash.el
index 68a5cfd..8172590 100644
--- a/lisp/hashcash.el
+++ b/lisp/hashcash.el
@@ -1,8 +1,8 @@
 ;;; hashcash.el --- Add hashcash payments to email
 
-;; Copyright (C) 2003, 2004 Free Software Foundation
-;; Copyright (C) 1997--2002 Paul E. Foley
+;; Copyright (C) 2003, 2004, 2005 Free Software Foundation
 
+;; Written by: Paul Foley <mycroft@actrix.gen.nz> (1997-2002)
 ;; Maintainer: Paul Foley <mycroft@actrix.gen.nz>
 ;; Keywords: mail, hashcash
 
@@ -85,6 +85,11 @@ is used instead.")
 (defcustom hashcash-path (executable-find "hashcash")
   "*The path to the hashcash binary.")
 
+(defcustom hashcash-extra-generate-parameters nil
+  "*A list of parameter strings passed to `hashcash-path' when minting.
+For example, you may want to set this to '(\"-Z2\") to reduce header length."
+  :type '(repeat string))
+
 (defcustom hashcash-double-spend-database "hashcash.db"
   "*The path to the double-spending database.")
 
@@ -140,8 +145,9 @@ is used instead.")
       (save-excursion
 	(set-buffer (get-buffer-create " *hashcash*"))
 	(erase-buffer)
-	(call-process hashcash-path nil t nil
-		      "-m" "-q" "-b" (number-to-string val) str)
+	(apply 'call-process hashcash-path nil t nil
+	       "-m" "-q" "-b" (number-to-string val) str
+	       hashcash-extra-generate-parameters)
 	(goto-char (point-min))
 	(hashcash-token-substring))
     (error "No `hashcash' binary found")))
@@ -150,8 +156,10 @@ is used instead.")
   "Generate a hashcash payment by finding a VAL-bit collison on STR.
 Return immediately.  Call CALLBACK with process and result when ready."
   (if (> val 0)
-      (let ((process (start-process "hashcash" nil
-				    hashcash-path "-m" "-q" "-b" (number-to-string val) str)))
+      (let ((process (apply 'start-process "hashcash" nil
+			    hashcash-path "-m" "-q"
+			    "-b" (number-to-string val) str
+			    hashcash-extra-generate-parameters)))
 	(setq hashcash-process-alist (cons
 				      (cons process (current-buffer))
 				      hashcash-process-alist))
diff --git a/texi/ChangeLog b/texi/ChangeLog
index 33b26ca..0cb175c 100644
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,7 @@
+2005-01-16  Xavier Maillard <zedek@gnu-rox.org> (tiny change)
+
+	* gnus-faq.texi ([4.1]): Typo.
+
 2005-01-15  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* gnus.texi (Topic Commands): Fix next/previous.
diff --git a/texi/gnus-faq.texi b/texi/gnus-faq.texi
index 4b49286..72c37e5 100644
--- a/texi/gnus-faq.texi
+++ b/texi/gnus-faq.texi
@@ -1,6 +1,6 @@
 @c Insert  "\input texinfo" at 1st line before texing this file alone.
 @c -*-texinfo-*-
-@c Copyright (C) 1995, 2001, 2003, 2004 Free Software Foundation, Inc.
+@c Copyright (C) 1995, 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
 @setfilename gnus-faq.info
 
 @c Frequently Asked Questions, FAQ - Introduction, Emacs for Heathens, Top
@@ -857,7 +857,7 @@ Answer:
 
  If you enter the group by saying 
  @samp{RET}
- in summary buffer with point over the group, only unread and ticked messages are loaded. Say
+ in group buffer with point over the group, only unread and ticked messages are loaded. Say
  @samp{C-u RET}
  instead to load all available messages. If you want only the e.g. 300 newest say
  @samp{C-u 300 RET}