*** empty log message ***

[gnus] / lisp / gnus-kill.el

diff --git a/lisp/gnus-kill.el b/lisp/gnus-kill.el
index 634e1c1..990a37b 100644 (file)
--- a/lisp/gnus-kill.el
+++ b/lisp/gnus-kill.el
@@ -406,8 +406,7 @@ Returns the number of articles marked as read."
              (gnus-add-current-to-buffer-list)
              (goto-char (point-min))
 
-             (if (consp (condition-case nil (read (current-buffer))
-                          (error nil)))
+             (if (consp (ignore-errors (read (current-buffer))))
                  (gnus-kill-parse-gnus-kill-file)
                (gnus-kill-parse-rn-kill-file))
            
@@ -441,8 +440,7 @@ Returns the number of articles marked as read."
   (let (beg form)
     (while (progn 
             (setq beg (point))
-            (setq form (condition-case () (read (current-buffer))
-                         (error nil))))
+            (setq form (ignore-errors (read (current-buffer)))))
       (unless (listp form)
        (error "Illegal kill entry (possibly rn kill file?): %s" form))
       (if (or (eq (car form) 'gnus-kill)
@@ -453,7 +451,7 @@ Returns the number of articles marked as read."
            (insert (or (eval form) "")))
        (save-excursion
          (set-buffer gnus-summary-buffer)
-         (condition-case () (eval form) (error nil)))))
+         (ignore-errors (eval form)))))
     (and (buffer-modified-p)
         gnus-kill-save-kill-file
         (save-buffer))
@@ -684,6 +682,7 @@ score the alt hierarchy, you'd say \"!alt.all\"."
         (gnus-expert-user t)
         (nnmail-spool-file nil)
         (gnus-use-dribble-file nil)
+        (gnus-batch-mode t)
         group newsrc entry
         ;; Disable verbose message.
         gnus-novice-user gnus-large-newsgroup
@@ -691,16 +690,17 @@ score the alt hierarchy, you'd say \"!alt.all\"."
         gnus-options-not-subscribe)
     ;; Eat all arguments.
     (setq command-line-args-left nil)
-    (gnus)
+    (gnus-slave)
     ;; Apply kills to specified newsgroups in command line arguments.
     (setq newsrc (cdr gnus-newsrc-alist))
     (while (setq group (car (pop newsrc)))
       (setq entry (gnus-gethash group gnus-newsrc-hashtb))
-      (when (and (<= (nth 1 (car newsrc)) gnus-level-subscribed)
+      (when (and (<= (gnus-info-level (car newsrc)) gnus-level-subscribed)
                 (and (car entry)
                      (or (eq (car entry) t)
                          (not (zerop (car entry)))))
-                (eq (gnus-matches-options-n group) 'subscribe))
+                ;;(eq (gnus-matches-options-n group) 'subscribe)
+                )
        (gnus-summary-read-group group nil t nil t)
        (when (eq (current-buffer) (get-buffer gnus-summary-buffer))
          (gnus-summary-exit))))