Synch to No Gnus 200503230048.

[elisp/gnus.git-] / lisp / gnus-nocem.el

diff --git a/lisp/gnus-nocem.el b/lisp/gnus-nocem.el
index 38bd552..bbaf550 100644 (file)
--- a/lisp/gnus-nocem.el
+++ b/lisp/gnus-nocem.el
@@ -1,6 +1,6 @@
 ;;; gnus-nocem.el --- NoCeM pseudo-cancellation treatment
 
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2004
 ;;        Free Software Foundation, Inc.
 
 
@@ -29,7 +29,6 @@
 ;;; Code:
 
 (eval-when-compile (require 'cl))
-(eval-when-compile (require 'gnus-clfns))
 
 (require 'gnus)
 (require 'nnmail)
@@ -191,7 +190,7 @@ valid issuer, which is much faster if you are selective about the issuers."
                       (and gnus-nocem-check-from
                            (let ((case-fold-search t))
                              (catch 'ok
-                               (mapcar
+                               (mapc
                                 (lambda (author)
                                   (if (consp author)
                                       (setq author (car author)))
@@ -298,7 +297,8 @@ valid issuer, which is much faster if you are selective about the issuers."
       (while (search-forward "\t" nil t)
        (cond
         ((not (ignore-errors
-                (setq group (let ((obarray gnus-active-hashtb)) (read buf)))))
+                (setq group (let ((obarray gnus-nocem-real-group-hashtb))
+                              (read buf)))))
          ;; An error.
          )
         ((not (symbolp group))