From e5bfef06b17b2c326afda6416aa8a36029662dd1 Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Tue, 3 Feb 2004 22:18:22 +0000
Subject: [PATCH] Synch to No Gnus 200402032042.

---
 lisp/ChangeLog      |   26 ++++++++++++++++++++++++++
 lisp/nnfolder.el    |    4 ++--
 lisp/nnlistserv.el  |    2 +-
 lisp/nnml.el        |    4 ++--
 lisp/sieve.el       |    2 +-
 lisp/spam-report.el |   30 +++++++++++++++++++++++++++---
 lisp/spam.el        |   12 ++++++------
 texi/ChangeLog      |    5 +++++
 texi/gnus-ja.texi   |    2 +-
 texi/gnus.texi      |    2 +-
 10 files changed, 72 insertions(+), 17 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dbe2a66..04c67f2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,31 @@
+2004-02-03  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* spam.el (spam-directory): Derive from `gnus-directory'.
+
+	* spam-report.el (spam-report-url-to-file)
+	(spam-report-requests-file): New function and variable for offline
+	reporting.
+	(spam-report-url-ping-function): Add `spam-report-url-to-file'
+	and user defined function.
+	(spam-report-url-ping-mm-url): Remove doubled slash.
+
+2004-02-03  Teodor Zlatanov  <tzz@lifelogs.com>
+
+	* spam.el (spam-list-of-processors): fixed spamassassin variable names
+
 2004-02-03  Jesper Harder  <harder@ifa.au.dk>
 
+	* spam.el (spam-check-spamoracle, spam-spamoracle-learn): Fix
+	format string mismatch.
+
+	* sieve.el (sieve-deactivate-all): do.
+
+	* nnfolder.el (nnfolder-request-set-mark, nnfolder-save-marks): do.
+
+	* nnlistserv.el (nnlistserv-kk-wash-article): do.
+
+	* nnml.el (nnml-request-set-mark, nnml-save-marks): do.	
+
 	* mm-bodies.el (mm-7bit-chars): Don't include \r.
 
 2004-02-02  Teodor Zlatanov  <tzz@lifelogs.com>
diff --git a/lisp/nnfolder.el b/lisp/nnfolder.el
index fae2f28..08ae99c 100644
--- a/lisp/nnfolder.el
+++ b/lisp/nnfolder.el
@@ -1175,7 +1175,7 @@ This command does not work if you use short group names."
       (let ((range (nth 0 action))
 	    (what  (nth 1 action))
 	    (marks (nth 2 action)))
-	(assert (or (eq what 'add) (eq what 'del)) t
+	(assert (or (eq what 'add) (eq what 'del)) nil
 		"Unknown request-set-mark action: %s" what)
 	(dolist (mark marks)
 	  (setq nnfolder-marks (gnus-update-alist-soft
@@ -1241,7 +1241,7 @@ This command does not work if you use short group names."
 			nnfolder-marks-modtime))
       (error (or (gnus-yes-or-no-p
 		  (format "Could not write to %s (%s).  Continue? " file err))
-		 (error "Cannot write to %s (%s)" err))))))
+		 (error "Cannot write to %s (%s)" file err))))))
 
 (defun nnfolder-open-marks (group server)
   (let ((file (nnfolder-group-marks-pathname group)))
diff --git a/lisp/nnlistserv.el b/lisp/nnlistserv.el
index 1008141..6391dd4 100644
--- a/lisp/nnlistserv.el
+++ b/lisp/nnlistserv.el
@@ -122,7 +122,7 @@
     (mm-url-decode-entities)
     (while headers
       (goto-char (point-min))
-      (re-search-forward (format "<!-- %s=\"\\([^\"]+\\)" (car headers) nil t))
+      (re-search-forward (format "<!-- %s=\"\\([^\"]+\\)" (car headers)) nil t)
       (set (pop headers) (match-string 1)))
     (goto-char (point-min))
     (search-forward "<!-- body" nil t)
diff --git a/lisp/nnml.el b/lisp/nnml.el
index 7fb52c9..38bcd58 100644
--- a/lisp/nnml.el
+++ b/lisp/nnml.el
@@ -924,7 +924,7 @@ Use the nov database for the current group if available."
       (let ((range (nth 0 action))
 	    (what  (nth 1 action))
 	    (marks (nth 2 action)))
-	(assert (or (eq what 'add) (eq what 'del)) t
+	(assert (or (eq what 'add) (eq what 'del)) nil
 		"Unknown request-set-mark action: %s" what)
 	(dolist (mark marks)
 	  (setq nnml-marks (gnus-update-alist-soft
@@ -985,7 +985,7 @@ Use the nov database for the current group if available."
 			nnml-marks-modtime))
       (error (or (gnus-yes-or-no-p
 		  (format "Could not write to %s (%s).  Continue? " file err))
-		 (error "Cannot write to %s (%s)" err))))))
+		 (error "Cannot write to %s (%s)" file err))))))
 
 (defun nnml-open-marks (group server)
   (let ((file (expand-file-name
diff --git a/lisp/sieve.el b/lisp/sieve.el
index 83dd4f3..2b044ad 100644
--- a/lisp/sieve.el
+++ b/lisp/sieve.el
@@ -173,7 +173,7 @@ require \"fileinto\";
     (sieve-refresh-scriptlist)
     (if (sieve-manage-ok-p err)
 	(message "Deactivating scripts...done")
-      (message "Deactivating scripts...failed" (nth 2 err)))))
+      (message "Deactivating scripts...failed: %s" (nth 2 err)))))
 
 (defalias 'sieve-deactivate 'sieve-deactivate-all)
 
diff --git a/lisp/spam-report.el b/lisp/spam-report.el
index efd6778..2307cc8 100644
--- a/lisp/spam-report.el
+++ b/lisp/spam-report.el
@@ -59,12 +59,24 @@ instead."
 
 (defcustom spam-report-url-ping-function
   'spam-report-url-ping-plain
-  "Function to use for url ping spam reporting."
+  "Function to use for url ping spam reporting.
+The function must accept the arguments `host' and `report'."
   :type '(choice
 	  (const :tag "Connect directly"
 		 spam-report-url-ping-plain)
 	  (const :tag "Use the external program specified in `mm-url-program'"
-		 spam-report-url-ping-mm-url))
+		 spam-report-url-ping-mm-url)
+	  (const :tag "Store request URLs in `spam-report-requests-file'"
+		 spam-report-url-to-file)
+	  (function :tag "User defined function" nil))
+  :group 'spam-report)
+
+(defcustom spam-report-requests-file
+  (nnheader-concat gnus-directory "spam/" "spam-report-requests.url")
+  ;; Is there a convention for the extension of such a file?
+  ;; Should we use `spam-directory'?
+  "File where spam report request are stored."
+  :type 'file
   :group 'spam-report)
 
 (defun spam-report-gmane (&rest articles)
@@ -118,9 +130,21 @@ the function specified by `spam-report-url-ping-function'."
 the external program specified in `mm-url-program' to connect to
 server."
   (with-temp-buffer
-    (let ((url (concat "http://" host "/" report)))
+    (let ((url (concat "http://" host report)))
       (mm-url-insert url t))))
 
+(defun spam-report-url-to-file (host report)
+  "Collect spam report requests in `spam-report-requests-file'.
+Customize `spam-report-url-ping-function' to use this function."
+  (let ((url (concat "http://" host report))
+	(file spam-report-requests-file))
+    (gnus-make-directory (file-name-directory file))
+    (gnus-message 9 "Writing URL `%s' to file `%s'" url file)
+    (with-temp-buffer
+      (insert url)
+      (newline)
+      (append-to-file (point-min) (point-max) file))))
+
 (provide 'spam-report)
 
 ;;; spam-report.el ends here.
diff --git a/lisp/spam.el b/lisp/spam.el
index fe25c0f..a957be2 100644
--- a/lisp/spam.el
+++ b/lisp/spam.el
@@ -73,7 +73,7 @@
 (defgroup spam nil
   "Spam configuration.")
 
-(defcustom spam-directory "~/News/spam/"
+(defcustom spam-directory (nnheader-concat gnus-directory "spam/")
   "Directory for spam whitelists and blacklists."
   :type 'directory
   :group 'spam)
@@ -585,14 +585,14 @@ finds ham or spam.")
     (gnus-group-spam-exit-processor-ifile        spam spam-use-ifile)
     (gnus-group-spam-exit-processor-stat         spam spam-use-stat)
     (gnus-group-spam-exit-processor-spamoracle   spam spam-use-spamoracle)
-    (gnus-group-spam-exit-processor-spamassassin spam spam-use-spam-spamassassin)
+    (gnus-group-spam-exit-processor-spamassassin spam spam-use-spamassassin)
     (gnus-group-ham-exit-processor-ifile         ham spam-use-ifile)
     (gnus-group-ham-exit-processor-bogofilter    ham spam-use-bogofilter)
     (gnus-group-ham-exit-processor-stat          ham spam-use-stat)
     (gnus-group-ham-exit-processor-whitelist     ham spam-use-whitelist)
     (gnus-group-ham-exit-processor-BBDB          ham spam-use-BBDB)
     (gnus-group-ham-exit-processor-copy          ham spam-use-ham-copy)
-    (gnus-group-ham-exit-processor-spamassassin  ham spam-use-ham-spamassassin)
+    (gnus-group-ham-exit-processor-spamassassin  ham spam-use-spamassassin)
     (gnus-group-ham-exit-processor-spamoracle    ham spam-use-spamoracle))
   "The `spam-list-of-processors' list.
 This list contains pairs associating a ham/spam exit processor
@@ -1977,7 +1977,7 @@ REMOVE not nil, remove the ADDRESSES."
 		  (goto-char (point-min))
 		  (when (re-search-forward "^X-Spam: yes;" nil t)
 		    spam-split-group))
-	      (error "Error running spamoracle" status))))))))
+	      (error "Error running spamoracle: %s" status))))))))
 
 (defun spam-spamoracle-learn (articles article-is-spam-p &optional unregister)
   "Run spamoracle in training mode."
@@ -1999,8 +1999,8 @@ REMOVE not nil, remove the ADDRESSES."
 			   `("-f" ,spam-spamoracle-database
 			     "add" ,arg)
 			 `("add" ,arg)))))
-	  (when (not (eq 0 status))
-	    (error "Error running spamoracle" status)))))))
+	  (unless (eq 0 status)
+	    (error "Error running spamoracle: %s" status)))))))
 
 (defun spam-spamoracle-learn-ham (articles &optional unregister)
   (spam-spamoracle-learn articles nil unregister))
diff --git a/texi/ChangeLog b/texi/ChangeLog
index 61bf36e..990cc2d 100644
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-03  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* gnus.texi (Batching Agents): Fixed typo in example.  Reported
+	by Hiroshi Fujishima <pooh@nature.tsukuba.ac.jp>.
+
 2004-01-30  Jesper Harder  <harder@ifa.au.dk>
 
 	* gnus.texi: Set documentencoding.
diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 2ebcaf5..7738dd2 100644
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -17818,7 +17818,7 @@ Gnus $B%(!<%8%'%s%H$K5-;v$r<hF@$5$;$k$N$O(B ($B$=$7$F$"$J$?$N=q$$$?2?$+$N%a%C
 
 @example
 #!/bin/sh
-emacs -batch -l ~/.emacs -f -l ~/.gnus.el gnus-agent-batch >/dev/null 2>&1
+emacs -batch -l ~/.emacs -l ~/.gnus.el gnus-agent-batch >/dev/null 2>&1
 @end example
 
 @node Control Agents
diff --git a/texi/gnus.texi b/texi/gnus.texi
index 5ad7977..d0cedf0 100644
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -18601,7 +18601,7 @@ following incantation:
 
 @example
 #!/bin/sh
-emacs -batch -l ~/.emacs -f -l ~/.gnus.el gnus-agent-batch >/dev/null 2>&1
+emacs -batch -l ~/.emacs -l ~/.gnus.el gnus-agent-batch >/dev/null 2>&1
 @end example
 
 
-- 
1.7.10.4