From e0651adaa233905a1fe0b64769e9301821c3d315 Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Tue, 13 Apr 2004 21:53:42 +0000
Subject: [PATCH] Synch to No Gnus 200404131936.

---
 lisp/ChangeLog        |   12 ++++++++++++
 lisp/gnus-registry.el |    9 +++++++--
 lisp/spam.el          |   16 ++++++++--------
 3 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b900469..4ca1bb2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,15 @@
+2004-04-13  Teodor Zlatanov  <tzz@lifelogs.com>
+
+	* spam.el (spam-fetch-field-fast, spam-generate-fake-headers)
+	(spam-find-spam, spam-log-processing-to-registry)
+	(spam-log-registered-p, spam-log-unregistration-needed-p)
+	(spam-log-undo-registration): use gnus-message instead of
+	gnus-error, none of these errors are fatal
+
+	* gnus-registry.el (gnus-registry-clean-empty-function)
+	(gnus-registry-clean-empty): remove only empty entries without
+	extra data
+
 2004-04-12  Teodor Zlatanov  <tzz@lifelogs.com>
 
 	* spam-stat.el (spam-stat-buffer-change-to-spam)
diff --git a/lisp/gnus-registry.el b/lisp/gnus-registry.el
index 30060b4..3fa2c88 100644
--- a/lisp/gnus-registry.el
+++ b/lisp/gnus-registry.el
@@ -84,7 +84,8 @@ The group names are matched, they don't have to be fully qualified."
 
 (defcustom gnus-registry-clean-empty t
   "Whether the empty registry entries should be deleted.
-Registry entries are considered empty when they have no groups."
+Registry entries are considered empty when they have no groups
+and no extra data."
   :group 'gnus-registry
   :type 'boolean)
 
@@ -248,7 +249,11 @@ way."
   (let ((count 0))
     (maphash
      (lambda (key value)
-       (unless (gnus-registry-fetch-group key)
+       (unless (or
+		(gnus-registry-fetch-group key)
+		;; TODO: look for specific extra data here!
+		;; in this example, we look for 'label
+		(gnus-registry-fetch-extra key 'label)) 
 	 (incf count)
 	 (remhash key gnus-registry-hashtb)))
      gnus-registry-hashtb)
diff --git a/lisp/spam.el b/lisp/spam.el
index 0a4e494..5a566a5 100644
--- a/lisp/spam.el
+++ b/lisp/spam.el
@@ -951,7 +951,7 @@ When either list is nil, the other is returned."
 	  (mail-header-extra data-header))
 	 (t
 	  nil))
-	(gnus-error 5 "Article %d has a nil data header" article)))))
+	(gnus-message 5 "Article %d has a nil data header" article)))))
 
 (defun spam-fetch-field-from-fast (article &optional prepared-data-header)
   (spam-fetch-field-fast article 'from prepared-data-header))
@@ -977,7 +977,7 @@ When either list is nil, the other is returned."
 	  (spam-fetch-field-fast article 'xref dh))
 	 (when (spam-fetch-field-fast article 'extra dh)
 	   (format "%s\n" (spam-fetch-field-fast article 'extra dh))))
-      (gnus-error
+      (gnus-message
        5
        "spam-generate-fake-headers: article %d didn't have a valid header"
        article))))
@@ -1122,7 +1122,7 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
 	     registry-lookup)
 	 
 	 (unless id
-	   (gnus-error 5 "Article %d has no message ID!" article))
+	   (gnus-message 5 "Article %d has no message ID!" article))
 	 
 	 (when (and id spam-log-to-registry)
 	   (setq registry-lookup (spam-log-registration-type id 'incoming))
@@ -1318,7 +1318,7 @@ functions")
 	   type
 	   cell-list))
 
-      (gnus-error 
+      (gnus-message 
        5 
        (format "%s call with bad ID, type, classification, spam-check, or group"
 	       "spam-log-processing-to-registry")))))
@@ -1330,7 +1330,7 @@ functions")
 	     (spam-process-type-valid-p type))
 	(cdr-safe (gnus-registry-fetch-extra id type))
       (progn
-	(gnus-error 
+	(gnus-message
 	 5 
 	 (format "%s called with bad ID, type, classification, or spam-check"
 		 "spam-log-registered-p"))
@@ -1369,7 +1369,7 @@ functions")
 		(setq found t))))
 	  found)
       (progn
-	(gnus-error 
+	(gnus-message
 	 5 
 	 (format "%s called with bad ID, type, classification, or spam-check"
 		 "spam-log-unregistration-needed-p"))
@@ -1395,8 +1395,8 @@ functions")
 	   type
 	   new-cell-list))
       (progn
-	(gnus-error 5 (format "%s call with bad ID, type, spam-check, or group"
-			      "spam-log-undo-registration"))
+	(gnus-message 5 (format "%s call with bad ID, type, spam-check, or group"
+				"spam-log-undo-registration"))
 	nil))))
 
 ;;; set up IMAP widening if it's necessary
-- 
1.7.10.4