From 031f6a1b765fd2c49ca5fa9ec8e295bb2762465f Mon Sep 17 00:00:00 2001 From: yamaoka Date: Fri, 5 Sep 2003 12:17:11 +0000 Subject: [PATCH] Synch to Gnus 200309051220. --- lisp/ChangeLog | 7 +++++++ lisp/gnus-registry.el | 13 +++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 54e24ba..bd4c6ed 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2003-09-05 Teodor Zlatanov + + * 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' + 2003-09-05 Jesper Harder * gnus-art.el (gnus-button-alist): Improve Info regexp. diff --git a/lisp/gnus-registry.el b/lisp/gnus-registry.el index fc667de..ada28f0 100644 --- a/lisp/gnus-registry.el +++ b/lisp/gnus-registry.el @@ -357,11 +357,11 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details." (setq references (nreverse (gnus-split-references refstr))) (mapcar (lambda (x) (setq res (or (gnus-registry-fetch-group x) res)) - (when (or (gnus-registry-grep-in-list + (when (or (gnus-registry-grep-in-list res gnus-registry-unfollowed-groups) (gnus-registry-grep-in-list - res + res nnmail-split-fancy-with-parent-ignore-groups)) (setq res nil))) references)) @@ -385,13 +385,13 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details." "gnus-registry-split-fancy-with-parent" subject (if res res "nil"))))) - gnus-registry-hashtb)))) - + 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))) + res)) (defun gnus-registry-register-message-ids () "Register the Message-ID of every article in the group" @@ -469,7 +469,8 @@ Update the entry cache if needed." (unless entree (setq entree (assq entry alist)) - (puthash id entree entry-cache)) + (when gnus-registry-entry-caching + (puthash id entree entry-cache))) entree) alist)) -- 1.7.10.4