From: yamaoka <yamaoka>
Date: Mon, 18 Oct 2004 22:06:09 +0000 (+0000)
Subject: Synch to No Gnus 200410181844.
X-Git-Tag: t-gnus-6_17_4-quimby-~704
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48990ac593481a0fad129fc4d426fada65143c4a;p=elisp%2Fgnus.git-

Synch to No Gnus 200410181844.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index def8ad0..0a2a62b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,17 @@
+2004-10-18  Teodor Zlatanov  <tzz@lifelogs.com>
+
+	* gnus-util.el (gnus-split-references): accept a nil references
+	string and go on blissfully
+
+	* gnus-registry.el (gnus-registry-split-fancy-with-parent): catch
+	cases where the references string is non-nil but has no references
+
+	* encrypt.el: add autoload tags
+
+	* spam.el (spam-resolve-registrations-routine): remove article
+	from unregistration list too.  Reported by David Hanak
+	<dhanak@isis.vanderbilt.edu>
+
 2004-10-18  Reiner Steib  <Reiner.Steib@gmx.de>
 
 	* gnus-art.el (gnus-copy-article-ignored-headers): Default to
@@ -11,6 +25,8 @@
 
 2004-10-15  Teodor Zlatanov  <tzz@lifelogs.com>
 
+	* encrypt.el: add autoload cookies
+
 	* spam.el (spam-backend-article-list-property)
 	(spam-backend-get-article-todo-list)
 	(spam-backend-put-article-todo-list, )
diff --git a/lisp/encrypt.el b/lisp/encrypt.el
index 4f2e29f..7e3598a 100644
--- a/lisp/encrypt.el
+++ b/lisp/encrypt.el
@@ -98,6 +98,7 @@ Format example:
 (defvar encrypt-temp-prefix "encrypt"
   "Prefix for temporary filenames")
 
+;;;###autoload
 (defun encrypt-find-model (filename)
   "Given a filename, find a encrypt-file-alist entry"
   (dolist (entry encrypt-file-alist)
@@ -107,6 +108,7 @@ Format example:
 		(string-match match filename))
 	(return model)))))
 
+;;;###autoload
 (defun encrypt-insert-file-contents (file &optional model)
   "Decrypt FILE into the current buffer."
   (interactive "fFile to insert: ")
diff --git a/lisp/gnus-registry.el b/lisp/gnus-registry.el
index a770524..62d438f 100644
--- a/lisp/gnus-registry.el
+++ b/lisp/gnus-registry.el
@@ -369,7 +369,8 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
 	     nnmail-split-fancy-with-parent-ignore-groups
 	   (list nnmail-split-fancy-with-parent-ignore-groups)))
 	references res)
-    (if refstr
+    ;; the references string must be valid and parse to valid references
+    (if (and refstr (gnus-extract-references refstr))
 	(progn
 	  (setq references (nreverse (gnus-extract-references refstr)))
 	  (mapcar (lambda (x)
diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el
index b3be625..19ab5e7 100644
--- a/lisp/gnus-util.el
+++ b/lisp/gnus-util.el
@@ -482,6 +482,7 @@ inside loops."
 (defun gnus-split-references (references)
   "Return a list of Message-IDs in REFERENCES."
   (let ((beg 0)
+	(references (or references ""))
 	ids)
     (while (string-match "<[^<]+[^< \t]" references beg)
       (push (substring references (match-beginning 0) (setq beg (match-end 0)))
diff --git a/lisp/spam.el b/lisp/spam.el
index d8e8f80..9a44ab2 100644
--- a/lisp/spam.el
+++ b/lisp/spam.el
@@ -1704,10 +1704,11 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
 					      t)
 
 	  ;; eliminate duplicates
-	  (dolist (article ulist)
-	    (when (assq article rlist)
+	  (dolist (article (copy-sequence ulist))
+	    (when (memq article rlist)
 	      (incf delcount)
-	      (setq rlist (delq article rlist))))
+	      (setq rlist (delq article rlist))
+	      (setq ulist (delq article ulist))))
 	  
 	  (unless (zerop delcount)
 	    (gnus-message