*** empty log message ***

[gnus] / lisp / gnus-nocem.el

diff --git a/lisp/gnus-nocem.el b/lisp/gnus-nocem.el
index d01f2eb..15044a8 100644 (file)
--- a/lisp/gnus-nocem.el
+++ b/lisp/gnus-nocem.el
@@ -36,7 +36,8 @@
   :group 'gnus-score)
 
 (defcustom gnus-nocem-groups 
-  '("alt.nocem.misc" "news.admin.net-abuse.announce")
+  '("news.lists.filters" "news.admin.net-abuse.bulletins"
+    "alt.nocem.misc" "news.admin.net-abuse.announce")
   "List of groups that will be searched for NoCeM messages."
   :group 'gnus-nocem
   :type '(repeat (string :tag "Group")))
@@ -187,7 +188,6 @@ matches an previously scanned and verified nocem message."
             (push (mail-header-message-id header) ; But don't come back for
                   gnus-nocem-seen-message-ids)))))) ; second helpings.
 
-  
 (defun gnus-nocem-verify-issuer (person)
   "Verify using PGP that the canceler is who she says she is."
   (if (fboundp gnus-nocem-verifyer)
@@ -206,24 +206,31 @@ matches an previously scanned and verified nocem message."
       (narrow-to-region b (1+ (match-beginning 0)))
       (goto-char (point-min))
       (while (search-forward "\t" nil t)
-       (if (ignore-errors
-             (setq group (let ((obarray gnus-active-hashtb)) (read buf))))
-           (if (not (boundp group))
-               ;; Make sure all entries in the hashtb are bound.
-               (set group nil)
-             (when (gnus-gethash (symbol-name group) gnus-newsrc-hashtb)
-               ;; Valid group.
-               (beginning-of-line)
-               (while (= (following-char) ?\t)
-                 (forward-line -1))
-               (setq id (buffer-substring (point) (1- (search-forward "\t"))))
-               (unless (gnus-gethash id gnus-nocem-hashtb)
-                 ;; only store if not already present
-                 (gnus-sethash id t gnus-nocem-hashtb)
-                 (push id ncm))
-               (forward-line 1)
-               (while (= (following-char) ?\t)
-                 (forward-line 1))))))
+       (cond
+        ((not (ignore-errors
+                (setq group (let ((obarray gnus-active-hashtb)) (read buf)))))
+         ;; An error.
+         )
+        ((not (symbolp group))
+         ;; Ignore invalid entries.
+         )
+        ((not (boundp group))
+         ;; Make sure all entries in the hashtb are bound.
+         (set group nil))
+        (t
+         (when (gnus-gethash (symbol-name group) gnus-newsrc-hashtb)
+           ;; Valid group.
+           (beginning-of-line)
+           (while (= (following-char) ?\t)
+             (forward-line -1))
+           (setq id (buffer-substring (point) (1- (search-forward "\t"))))
+           (unless (gnus-gethash id gnus-nocem-hashtb)
+             ;; only store if not already present
+             (gnus-sethash id t gnus-nocem-hashtb)
+             (push id ncm))
+           (forward-line 1)
+           (while (= (following-char) ?\t)
+             (forward-line 1))))))
       (when ncm
        (setq gnus-nocem-touched-alist t)
        (push (cons (let ((time (current-time))) (setcdr (cdr time) nil) time)