From: yamaoka <yamaoka>
Date: Fri, 5 Sep 2003 15:03:48 +0000 (+0000)
Subject: Synch to Gnus 200309051304.
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6506568ca96ecf231291e996ae191373758c081f;p=elisp%2Fgnus.git-

Synch to Gnus 200309051304.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bd4c6ed..3aa8db5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,9 +1,13 @@
 2003-09-05  Teodor Zlatanov  <tzz@lifelogs.com>
 
+	* gnus-registry.el (gnus-registry-split-fancy-with-parent): yet
+	another error *sigh*
+
 	* gnus-registry.el (gnus-registry-fetch-extra-entry): don't use
 	puthash unless gnus-registry-entry-caching is on
 	(gnus-registry-split-fancy-with-parent): misplaced parenthesis
 	made everything a part of the 'else'
+	(gnus-registry-save): used 'entry-caching' instead of 'caching'
 
 2003-09-05  Jesper Harder  <harder@ifa.au.dk>
 
diff --git a/lisp/gnus-registry.el b/lisp/gnus-registry.el
index ada28f0..cb48b89 100644
--- a/lisp/gnus-registry.el
+++ b/lisp/gnus-registry.el
@@ -236,7 +236,7 @@ tracked this way."
 				 (hashtable-to-alist gnus-registry-hashtb)))
       ;; really save
       (gnus-registry-cache-save)
-      (setq gnus-registry-entry-caching entry-caching)
+      (setq gnus-registry-entry-caching caching)
       (setq gnus-registry-dirty nil))))
 
 (defun gnus-registry-clean-empty-function ()
@@ -386,12 +386,11 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
 		    subject
 		    (if res res "nil")))))
 	     gnus-registry-hashtb)))))
-      (debug res)
-      (gnus-message
-       5 
-       "gnus-registry-split-fancy-with-parent traced %s to group %s"
-       refstr (if res res "nil"))
-      res))
+    (gnus-message
+     5 
+     "gnus-registry-split-fancy-with-parent traced %s to group %s"
+     refstr (if res res "nil"))
+    res))
 
 (defun gnus-registry-register-message-ids ()
   "Register the Message-ID of every article in the group"
@@ -446,9 +445,10 @@ Returns the first place where the trail finds a nonstring."
 	(gethash id entry-cache)
       ;; else, if there is no caching possible...
       (let ((trail (gethash id gnus-registry-hashtb)))
-	(dolist (crumb trail)
-	  (unless (stringp crumb)
-	    (return (gnus-registry-fetch-extra-entry crumb entry id))))))))
+	(when (listp trail)
+	  (dolist (crumb trail)
+	    (unless (stringp crumb)
+	      (return (gnus-registry-fetch-extra-entry crumb entry id)))))))))
 
 (defun gnus-registry-fetch-extra-entry (alist &optional entry id)
   "Get the extra data of a message, or a specific entry in it.