X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lisp%2Fgnus-agent.el;h=2fefb48729aaeecee2ffc71ec02c30f9fb0e2fec;hb=5c1896b3f256d33d6be0c7c732d69ec011c98e10;hp=7b867e5b78a03035aa64af685427bc3e26497caa;hpb=027a90912122f2cb3e36d82310f32962e3ce2f71;p=elisp%2Fgnus.git-

diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el
index 7b867e5..2fefb48 100644
--- a/lisp/gnus-agent.el
+++ b/lisp/gnus-agent.el
@@ -1,7 +1,8 @@
-;;; gnus-agent.el --- unplugged support for Gnus
-;; Copyright (C) 1997,98,99 Free Software Foundation, Inc.
+;;; gnus-agent.el --- unplugged support for Semi-gnus
+;; Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
+;;	Tatsuya Ichikawa <t-ichi@po.shiojiri.ne.jp>
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
@@ -23,13 +24,19 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl))
+(eval-when-compile (require 'gnus-clfns))
+
 (require 'gnus)
 (require 'gnus-cache)
 (require 'nnvirtual)
 (require 'gnus-sum)
+(require 'gnus-score)
 (eval-when-compile
-  (require 'cl)
-  (require 'gnus-score))
+  (if (featurep 'xemacs)
+      (require 'itimer)
+    (require 'timer))
+  (require 'gnus-group))
 
 (defcustom gnus-agent-directory (nnheader-concat gnus-directory "agent/")
   "Where the Gnus agent will store its files."
@@ -82,6 +89,22 @@ If nil, only read articles will be expired."
   :group 'gnus-agent
   :type 'function)
 
+(defcustom gnus-agent-large-newsgroup nil
+  "*The number of articles which indicates a large newsgroup.
+If the number of unread articles exceeds it, The number of articles to be
+fetched will be limited to it. If not a positive integer, never consider it."
+  :group 'gnus-agent
+  :type '(choice (const nil)
+		 (integer :tag "Number")))
+
+(defcustom gnus-agent-synchronize-flags 'ask
+  "Indicate if flags are synchronized when you plug in.
+If this is `ask' the hook will query the user."
+  :type '(choice (const :tag "Always" t)
+		 (const :tag "Never" nil)
+		 (const :tag "Ask" ask))
+  :group 'gnus-agent)
+
 ;;; Internal variables
 
 (defvar gnus-agent-history-buffers nil)
@@ -99,10 +122,6 @@ If nil, only read articles will be expired."
 (defvar gnus-agent-send-mail-function nil)
 (defvar gnus-agent-file-coding-system 'raw-text)
 
-(defconst gnus-agent-scoreable-headers
-  '("subject" "from" "date" "message-id" "references" "chars" "lines" "xref")
-  "Headers that are considered when scoring articles for download via the Agent.")
-
 ;; Dynamic variables
 (defvar gnus-headers)
 (defvar gnus-score)
@@ -126,7 +145,7 @@ If nil, only read articles will be expired."
     (setq gnus-agent-overview-buffer
 	  (gnus-get-buffer-create " *Gnus agent overview*"))
     (with-current-buffer gnus-agent-overview-buffer
-      (mm-enable-multibyte))
+      (set-buffer-multibyte t))
     nil))
 
 (gnus-add-shutdown 'gnus-close-agent 'gnus)
@@ -185,7 +204,7 @@ If nil, only read articles will be expired."
 (defmacro gnus-agent-with-fetch (&rest forms)
   "Do FORMS safely."
   `(unwind-protect
-       (progn
+       (let ((gnus-agent-fetching t))
 	 (gnus-agent-start-fetch)
 	 ,@forms)
      (gnus-agent-stop-fetch)))
@@ -232,7 +251,7 @@ If nil, only read articles will be expired."
   "Jc" gnus-enter-category-buffer
   "Jj" gnus-agent-toggle-plugged
   "Js" gnus-agent-fetch-session
-  "JY" gnus-agent-synchronize
+  "JY" gnus-agent-synchronize-flags
   "JS" gnus-group-send-drafts
   "Ja" gnus-agent-add-group
   "Jr" gnus-agent-remove-group)
@@ -289,13 +308,14 @@ If nil, only read articles will be expired."
   (if plugged
       (progn
 	(setq gnus-plugged plugged)
+	(gnus-agent-possibly-synchronize-flags)
 	(gnus-run-hooks 'gnus-agent-plugged-hook)
 	(setcar (cdr gnus-agent-mode-status) " Plugged"))
     (gnus-agent-close-connections)
     (setq gnus-plugged plugged)
     (gnus-run-hooks 'gnus-agent-unplugged-hook)
     (setcar (cdr gnus-agent-mode-status) " Unplugged"))
-  (set-buffer-modified-p t))
+  (force-mode-line-update))
 
 (defun gnus-agent-close-connections ()
   "Close all methods covered by the Gnus agent."
@@ -370,6 +390,43 @@ be a select method."
     (while (search-backward "\n" nil t)
       (replace-match "\\n" t t))))
 
+(defun gnus-agent-restore-gcc ()
+  "Restore GCC field from saved header."
+  (save-excursion
+    (goto-char (point-min))
+    (while (re-search-forward (concat gnus-agent-gcc-header ":") nil t)
+      (replace-match "Gcc:" 'fixedcase))))
+
+(defun gnus-agent-any-covered-gcc ()
+  (save-restriction
+    (message-narrow-to-headers)
+    (let* ((gcc (mail-fetch-field "gcc" nil t))
+	   (methods (and gcc
+			 (mapcar 'gnus-inews-group-method
+				 (message-unquote-tokens
+				  (message-tokenize-header
+				   gcc " ,")))))
+	   covered)
+      (while (and (not covered) methods)
+	(setq covered
+	      (member (car methods) gnus-agent-covered-methods)
+	      methods (cdr methods)))
+      covered)))
+
+(defun gnus-agent-possibly-save-gcc ()
+  "Save GCC if Gnus is unplugged."
+  (when (and (not gnus-plugged) (gnus-agent-any-covered-gcc))
+    (save-excursion
+      (goto-char (point-min))
+      (let ((case-fold-search t))
+	(while (re-search-forward "^gcc:" nil t)
+	  (replace-match (concat gnus-agent-gcc-header ":") 'fixedcase))))))
+
+(defun gnus-agent-possibly-do-gcc ()
+  "Do GCC if Gnus is plugged."
+  (when (or gnus-plugged (not (gnus-agent-any-covered-gcc)))
+    (gnus-inews-do-gcc)))
+
 ;;;
 ;;; Group mode commands
 ;;;
@@ -424,26 +481,49 @@ be a select method."
 	  (setf (cadddr c) (delete group (cadddr c))))))
     (gnus-category-write)))
 
-(defun gnus-agent-synchronize ()
-  "Synchronize local, unplugged, data with backend.
-Currently sends flag setting requests, if any."
+(defun gnus-agent-synchronize-flags ()
+  "Synchronize unplugged flags with servers."
   (interactive)
   (save-excursion
     (dolist (gnus-command-method gnus-agent-covered-methods)
       (when (file-exists-p (gnus-agent-lib-file "flags"))
-	(set-buffer (get-buffer-create " *Gnus Agent flag synchronize*"))
-	(erase-buffer)
-	(insert-file-contents (gnus-agent-lib-file "flags"))
-	(if (null (gnus-check-server gnus-command-method))
-	    (message "Couldn't open server %s" (nth 1 gnus-command-method))
-	  (while (not (eobp))
-	    (if (null (eval (read (current-buffer))))
-		(progn (forward-line)
-		       (kill-line -1))
-	      (write-file (gnus-agent-lib-file "flags"))
-	      (error "Couldn't set flags from file %s"
-		     (gnus-agent-lib-file "flags"))))
-	  (write-file (gnus-agent-lib-file "flags")))))))
+	(gnus-agent-synchronize-flags-server gnus-command-method)))))
+
+(defun gnus-agent-possibly-synchronize-flags ()
+  "Synchronize flags according to `gnus-agent-synchronize-flags'."
+  (interactive)
+  (save-excursion
+    (dolist (gnus-command-method gnus-agent-covered-methods)
+      (when (file-exists-p (gnus-agent-lib-file "flags"))
+	(gnus-agent-possibly-synchronize-flags-server gnus-command-method)))))
+
+(defun gnus-agent-synchronize-flags-server (method)
+  "Synchronize flags set when unplugged for server."
+  (let ((gnus-command-method method))
+    (when (file-exists-p (gnus-agent-lib-file "flags"))
+      (set-buffer (get-buffer-create " *Gnus Agent flag synchronize*"))
+      (erase-buffer)
+      (nnheader-insert-file-contents (gnus-agent-lib-file "flags"))
+      (if (null (gnus-check-server gnus-command-method))
+	  (message "Couldn't open server %s" (nth 1 gnus-command-method))
+	(while (not (eobp))
+	  (if (null (eval (read (current-buffer))))
+	      (progn (forward-line)
+		     (kill-line -1))
+	    (write-file (gnus-agent-lib-file "flags"))
+	    (error "Couldn't set flags from file %s"
+		   (gnus-agent-lib-file "flags"))))
+	(delete-file (gnus-agent-lib-file "flags")))
+      (kill-buffer nil))))
+
+(defun gnus-agent-possibly-synchronize-flags-server (method)
+  "Synchronize flags for server according to `gnus-agent-synchronize-flags'."
+  (when (or (and gnus-agent-synchronize-flags
+		 (not (eq gnus-agent-synchronize-flags 'ask)))
+	    (and (eq gnus-agent-synchronize-flags 'ask)
+		 (gnus-y-or-n-p (format "Synchronize flags on server `%s'? "
+					(cadr method)))))
+    (gnus-agent-synchronize-flags-server method)))
 
 ;;;
 ;;; Server mode commands
@@ -483,8 +563,12 @@ Currently sends flag setting requests, if any."
 (defun gnus-agent-write-servers ()
   "Write the alist of covered servers."
   (gnus-make-directory (nnheader-concat gnus-agent-directory "lib"))
-  (with-temp-file (nnheader-concat gnus-agent-directory "lib/servers")
-    (prin1 gnus-agent-covered-methods (current-buffer))))
+  (let ((coding-system-for-write nnheader-file-coding-system)
+	(output-coding-system nnheader-file-coding-system)
+	(file-name-coding-system nnmail-pathname-coding-system)
+	(pathname-coding-system nnmail-pathname-coding-system))
+    (with-temp-file (nnheader-concat gnus-agent-directory "lib/servers")
+      (prin1 gnus-agent-covered-methods (current-buffer)))))
 
 ;;;
 ;;; Summary commands
@@ -591,7 +675,8 @@ the actual number of articles toggled is returned."
       (funcall function nil new)
       (gnus-agent-write-active file new)
       (erase-buffer)
-      (insert-file-contents-literally file))))
+      (insert-file-contents-as-coding-system gnus-agent-file-coding-system
+					     file))))
 
 (defun gnus-agent-write-active (file new)
   (let ((orig (gnus-make-hashtable (count-lines (point-min) (point-max))))
@@ -599,7 +684,8 @@ the actual number of articles toggled is returned."
 	elem osym)
     (when (file-exists-p file)
       (with-temp-buffer
-	(insert-file-contents file)
+	(insert-file-contents-as-coding-system gnus-agent-file-coding-system
+					       file)
 	(gnus-active-to-gnus-format nil orig))
       (mapatoms
        (lambda (sym)
@@ -610,8 +696,9 @@ the actual number of articles toggled is returned."
 	     (set (intern (symbol-name sym) orig) (symbol-value sym)))))
        new))
     (gnus-make-directory (file-name-directory file))
-    (let ((coding-system-for-write gnus-agent-file-coding-system))
-      (gnus-write-active-file file orig))))
+    ;; The hashtable contains real names of groups,  no more prefix
+    ;; removing, so set `full' to `t'.
+    (gnus-write-active-file file orig t)))
 
 (defun gnus-agent-save-groups (method)
   (gnus-agent-save-active-1 method 'gnus-groups-to-gnus-format))
@@ -619,7 +706,12 @@ the actual number of articles toggled is returned."
 (defun gnus-agent-save-group-info (method group active)
   (when (gnus-agent-method-p method)
     (let* ((gnus-command-method method)
-	   (file (gnus-agent-lib-file "active")))
+	   (coding-system-for-write nnheader-file-coding-system)
+	   (output-coding-system nnheader-file-coding-system)
+	   (file-name-coding-system nnmail-pathname-coding-system)
+	   (pathname-coding-system nnmail-pathname-coding-system)
+	   (file (gnus-agent-lib-file "active"))
+	   oactive)
       (gnus-make-directory (file-name-directory file))
       (with-temp-file file
 	(when (file-exists-p file)
@@ -627,9 +719,17 @@ the actual number of articles toggled is returned."
 	(goto-char (point-min))
 	(when (re-search-forward
 	       (concat "^" (regexp-quote group) " ") nil t)
+	  (save-excursion
+	    (save-restriction
+	      (narrow-to-region (match-beginning 0)
+				(progn
+				  (forward-line 1)
+				  (point)))
+	      (setq oactive (car (nnmail-parse-active)))))
 	  (gnus-delete-line))
-	(insert (format "%S %d %d y\n" (intern group) (cdr active)
-			(car active)))
+	(insert (format "%S %d %d y\n" (intern group)
+			(cdr active)
+			(or (car oactive) (car active))))
 	(goto-char (point-max))
 	(while (search-backward "\\." nil t)
 	  (delete-char 1))))))
@@ -641,7 +741,7 @@ the actual number of articles toggled is returned."
     (nnheader-translate-file-chars
      (nnheader-replace-chars-in-string
       (nnheader-replace-duplicate-chars-in-string
-       (nnheader-replace-chars-in-string 
+       (nnheader-replace-chars-in-string
 	(gnus-group-real-name group)
 	?/ ?_)
        ?. ?_)
@@ -677,16 +777,16 @@ the actual number of articles toggled is returned."
     (insert "\n")
     (let ((file (gnus-agent-lib-file "history")))
       (when (file-exists-p file)
-	(insert-file file))
+	(nnheader-insert-file-contents file))
       (set (make-local-variable 'gnus-agent-file-name) file))))
 
 (defun gnus-agent-save-history ()
   (save-excursion
     (set-buffer gnus-agent-current-history)
     (gnus-make-directory (file-name-directory gnus-agent-file-name))
-    (let ((coding-system-for-write gnus-agent-file-coding-system))
-      (write-region (1+ (point-min)) (point-max)
-		    gnus-agent-file-name nil 'silent))))
+    (write-region-as-coding-system
+     gnus-agent-file-coding-system
+     (1+ (point-min)) (point-max) gnus-agent-file-name nil 'silent)))
 
 (defun gnus-agent-close-history ()
   (when (gnus-buffer-live-p gnus-agent-current-history)
@@ -757,8 +857,8 @@ the actual number of articles toggled is returned."
 	  (with-temp-buffer
 	    (let (article)
 	      (while (setq article (pop articles))
-		(when (or 
-		       (gnus-backlog-request-article group article 
+		(when (or
+		       (gnus-backlog-request-article group article
 						     nntp-server-buffer)
 		       (gnus-request-article article group))
 		  (goto-char (point-max))
@@ -790,11 +890,10 @@ the actual number of articles toggled is returned."
 	    (if (not (re-search-forward "^Message-ID: *<\\([^>\n]+\\)>" nil t))
 		(setq id "No-Message-ID-in-article")
 	      (setq id (buffer-substring (match-beginning 1) (match-end 1))))
-	    (let ((coding-system-for-write
-		   gnus-agent-file-coding-system))
-	      (write-region (point-min) (point-max)
-			    (concat dir (number-to-string (caar pos)))
-			    nil 'silent))
+	    (write-region-as-coding-system
+	     gnus-agent-file-coding-system
+	     (point-min) (point-max)
+	     (concat dir (number-to-string (caar pos))) nil 'silent)
 	    (when (setq elem (assq (caar pos) gnus-agent-article-alist))
 	      (setcdr elem t))
 	    (gnus-agent-enter-history
@@ -834,12 +933,12 @@ the actual number of articles toggled is returned."
   (save-excursion
     (while gnus-agent-buffer-alist
       (set-buffer (cdar gnus-agent-buffer-alist))
-      (let ((coding-system-for-write
-	     gnus-agent-file-coding-system))
-	(write-region (point-min) (point-max)
-		      (gnus-agent-article-name ".overview"
-					       (caar gnus-agent-buffer-alist))
-		      nil 'silent))
+      (write-region-as-coding-system
+       gnus-agent-file-coding-system
+       (point-min) (point-max)
+       (gnus-agent-article-name ".overview"
+				(caar gnus-agent-buffer-alist))
+       nil 'silent)
       (pop gnus-agent-buffer-alist))
     (while gnus-agent-group-alist
       (with-temp-file (caar gnus-agent-group-alist)
@@ -848,15 +947,22 @@ the actual number of articles toggled is returned."
       (pop gnus-agent-group-alist))))
 
 (defun gnus-agent-fetch-headers (group &optional force)
-  (let ((articles (gnus-list-of-unread-articles group))
-	(gnus-decode-encoded-word-function 'identity)
-	(file (gnus-agent-article-name ".overview" group)))
-    ;; add article with marks to list of article headers we want to fetch
+  (let* ((articles (gnus-list-of-unread-articles group))
+	 (len (length articles))
+	 (gnus-decode-encoded-word-function 'identity)
+	 (file (gnus-agent-article-name ".overview" group))
+	 i)
+    ;; Check the number of articles is not too large.
+    (when (and (integerp gnus-agent-large-newsgroup)
+	       (< 0 gnus-agent-large-newsgroup))
+      (and (< 0 (setq i (- len gnus-agent-large-newsgroup)))
+	   (setq articles (nthcdr i articles))))
+    ;; add article with marks to list of article headers we want to fetch.
     (dolist (arts (gnus-info-marks (gnus-get-info group)))
-      (setq articles (union (gnus-uncompress-sequence (cdr arts))
-			    articles)))
+      (setq articles (gnus-union (gnus-uncompress-sequence (cdr arts))
+				 articles)))
     (setq articles (sort articles '<))
-    ;; remove known articles
+    ;; Remove known articles.
     (when (gnus-agent-load-alist group)
       (setq articles (gnus-sorted-intersection
 		      articles
@@ -865,20 +971,20 @@ the actual number of articles toggled is returned."
 			     (cdr (gnus-active group)))))))
     ;; Fetch them.
     (gnus-make-directory (nnheader-translate-file-chars
-			  (file-name-directory file)))
+			  (file-name-directory file) t))
     (when articles
       (gnus-message 7 "Fetching headers for %s..." group)
       (save-excursion
- 	(set-buffer nntp-server-buffer)
- 	(unless (eq 'nov (gnus-retrieve-headers articles group))
- 	  (nnvirtual-convert-headers))
- 	;; Save these headers for later processing.
- 	(copy-to-buffer gnus-agent-overview-buffer (point-min) (point-max))
+	(set-buffer nntp-server-buffer)
+	(unless (eq 'nov (gnus-retrieve-headers articles group))
+	  (nnvirtual-convert-headers))
+	;; Save these headers for later processing.
+	(copy-to-buffer gnus-agent-overview-buffer (point-min) (point-max))
 	(when (file-exists-p file)
 	  (gnus-agent-braid-nov group articles file))
-	(let ((coding-system-for-write
-	       gnus-agent-file-coding-system))
-	  (write-region (point-min) (point-max) file nil 'silent))
+	(write-region-as-coding-system
+	 gnus-agent-file-coding-system
+	 (point-min) (point-max) file nil 'silent)
 	(gnus-agent-save-alist group articles nil)
 	(gnus-agent-enter-history
 	 "last-header-fetched-for-session"
@@ -945,25 +1051,22 @@ the actual number of articles toggled is returned."
 
 (defun gnus-agent-save-alist (group &optional articles state dir)
   "Save the article-state alist for GROUP."
-  (with-temp-file (if dir
-		      (concat dir ".agentview")
-		    (gnus-agent-article-name ".agentview" group))
-    (princ (setq gnus-agent-article-alist
-		 (nconc gnus-agent-article-alist
-			(mapcar (lambda (article) (cons article state))
-				articles)))
-	   (current-buffer))
-    (insert "\n")))
+  (let ((file-name-coding-system nnmail-pathname-coding-system)
+	(pathname-coding-system nnmail-pathname-coding-system))
+    (with-temp-file (if dir
+			(concat dir ".agentview")
+		      (gnus-agent-article-name ".agentview" group))
+      (princ (setq gnus-agent-article-alist
+		   (nconc gnus-agent-article-alist
+			  (mapcar (lambda (article) (cons article state))
+				  articles)))
+	     (current-buffer))
+      (insert "\n"))))
 
 (defun gnus-agent-article-name (article group)
   (concat (gnus-agent-directory) (gnus-agent-group-path group) "/"
 	  (if (stringp article) article (string-to-number article))))
 
-(defun gnus-agent-batch-confirmation (msg)
-  "Show error message and return t."
-  (gnus-message 1 msg)
-  t)
-
 ;;;###autoload
 (defun gnus-agent-batch-fetch ()
   "Start Gnus and fetch session."
@@ -994,10 +1097,14 @@ the actual number of articles toggled is returned."
 		  (while (setq group (pop groups))
 		    (when (<= (gnus-group-level group) gnus-agent-handle-level)
 		      (gnus-agent-fetch-group-1 group gnus-command-method))))))
-	  (error 
+	  (error
 	   (unless (funcall gnus-agent-confirmation-function
 			    (format "Error (%s).  Continue? " err))
-	     (error "Cannot fetch articles into the Gnus agent."))))
+	     (error "Cannot fetch articles into the Gnus agent.")))
+	  (quit 
+	   (unless (funcall gnus-agent-confirmation-function
+			    (format "Quit (%s).  Continue? " err))
+	     (signal 'quit "Cannot fetch articles into the Gnus agent."))))
 	(pop methods))
       (gnus-message 6 "Finished fetching articles into the Gnus agent"))))
 
@@ -1008,23 +1115,25 @@ the actual number of articles toggled is returned."
 	gnus-newsgroup-dependencies gnus-newsgroup-headers
 	gnus-newsgroup-scored gnus-headers gnus-score
 	gnus-use-cache articles arts
-	category predicate info marks score-param)
+	category predicate info marks score-param
+	(gnus-summary-expunge-below gnus-summary-expunge-below)
+	(gnus-summary-mark-below gnus-summary-mark-below)
+	(gnus-orphan-score gnus-orphan-score)
+	;; Maybe some other gnus-summary local variables should also
+	;; be put here.
+	)
     (unless (gnus-check-group group)
       (error "Can't open server for %s" group))
     ;; Fetch headers.
     (when (and (or (gnus-active group) (gnus-activate-group group))
 	       (setq articles (gnus-agent-fetch-headers group))
-	       (progn
+	       (let ((nntp-server-buffer gnus-agent-overview-buffer))
 		 ;; Parse them and see which articles we want to fetch.
 		 (setq gnus-newsgroup-dependencies
 		       (make-vector (length articles) 0))
-		 ;; No need to call `gnus-get-newsgroup-headers-xover' with
-		 ;; the entire .overview for group as we still have the just
-		 ;; downloaded headers in `gnus-agent-overview-buffer'.
-		 (let ((nntp-server-buffer gnus-agent-overview-buffer))
-		   (setq gnus-newsgroup-headers
-			 (gnus-get-newsgroup-headers-xover articles nil nil 
-							   group)))
+		 (setq gnus-newsgroup-headers
+		       (gnus-get-newsgroup-headers-xover articles nil nil
+							 group))
 		 ;; `gnus-agent-overview-buffer' may be killed for
 		 ;; timeout reason.  If so, recreate it.
 		 (gnus-agent-create-buffer)))
@@ -1033,45 +1142,24 @@ the actual number of articles toggled is returned."
 	    (gnus-get-predicate
 	     (or (gnus-group-find-parameter group 'agent-predicate t)
 		 (cadr category))))
-      ;; Do we want to download everything, or nothing?
-      (if (or (eq (caaddr predicate) 'gnus-agent-true)
-	      (eq (caaddr predicate) 'gnus-agent-false))
-	  ;; Yes.
-	  (setq arts (symbol-value
-		      (cadr (assoc (caaddr predicate)
-				   '((gnus-agent-true articles)
-				     (gnus-agent-false nil))))))
-	;; No, we need to decide what we want.
+      (if (memq (caaddr predicate) '(gnus-agent-true gnus-agent-false))
+	  ;; Simple implementation
+	  (setq arts
+		(and (eq (caaddr predicate) 'gnus-agent-true) articles))
+	(setq arts nil)
 	(setq score-param
-	      (let ((score-method
-		     (or
-		      (gnus-group-find-parameter group 'agent-score t)
-		      (caddr category))))
-		(when score-method
-		  (require 'gnus-score)
-		  (if (eq score-method 'file)
-		      (let ((entries
-			     (gnus-score-load-files
-			      (gnus-all-score-files group)))
-			    list score-file)
-			(while (setq list (car entries))
-			  (push (car list) score-file)
-			  (setq list (cdr list))
-			  (while list
-			    (when (member (caar list)
-					  gnus-agent-scoreable-headers)
-			      (push (car list) score-file))
-			    (setq list (cdr list)))
-			  (setq score-param
-				(append score-param (list (nreverse score-file)))
-				score-file nil entries (cdr entries)))
-			(list score-param))
-		    (if (stringp (car score-method))
-			score-method
-		      (list (list score-method)))))))
+	      (or (gnus-group-get-parameter group 'agent-score t)
+		  (caddr category)))
+	;; Translate score-param into real one
+	(cond
+	 ((not score-param))
+	 ((eq score-param 'file)
+	  (setq score-param (gnus-all-score-files group)))
+	 ((stringp (car score-param)))
+	 (t
+	  (setq score-param (list (list score-param)))))
 	(when score-param
 	  (gnus-score-headers score-param))
-	(setq arts nil)
 	(while (setq gnus-headers (pop gnus-newsgroup-headers))
 	  (setq gnus-score
 		(or (cdr (assq (mail-header-number gnus-headers)
@@ -1276,7 +1364,7 @@ The following commands are available:
      (caddr info)
      (format "Editing the score expression for category %s" category)
      `(lambda (groups)
-	(setcar (cddr (assq ',category gnus-category-alist)) groups)
+	(setcar (nthcdr 2 (assq ',category gnus-category-alist)) groups)
 	(gnus-category-write)
 	(gnus-category-list)))))
 
@@ -1297,8 +1385,8 @@ The following commands are available:
   (let ((info (assq category gnus-category-alist))
 	(buffer-read-only nil))
     (gnus-delete-line)
-    (gnus-category-write)
-    (setq gnus-category-alist (delq info gnus-category-alist))))
+    (setq gnus-category-alist (delq info gnus-category-alist))
+    (gnus-category-write)))
 
 (defun gnus-category-copy (category to)
   "Copy the current category."
@@ -1437,8 +1525,9 @@ The following commands are available:
       (while (setq gnus-command-method (pop methods))
 	(when (file-exists-p (gnus-agent-lib-file "active"))
 	  (with-temp-buffer
-	    (insert-file-contents (gnus-agent-lib-file "active"))
-	    (gnus-active-to-gnus-format 
+	    (insert-file-contents-as-coding-system
+	     gnus-agent-file-coding-system (gnus-agent-lib-file "active"))
+	    (gnus-active-to-gnus-format
 	     gnus-command-method
 	     (setq orig (gnus-make-hashtable
 			 (count-lines (point-min) (point-max))))))
@@ -1479,8 +1568,11 @@ The following commands are available:
 			       (gnus-uncompress-range
 				(cdr (assq 'tick (gnus-info-marks info))))
 			       (gnus-uncompress-range
-				(cdr (assq 'dormant
-					   (gnus-info-marks info)))))
+				(cdr (assq 'dormant (gnus-info-marks info))))
+			       (gnus-uncompress-range
+				(cdr (assq 'save (gnus-info-marks info))))
+			       (gnus-uncompress-range
+				(cdr (assq 'reply (gnus-info-marks info)))))
 		       nov-file (gnus-agent-article-name ".overview" group)
 		       lowest nil
 		       highest nil)
@@ -1504,7 +1596,7 @@ The following commands are available:
 				 (or (not (numberp
 					   (setq art (read (current-buffer)))))
 				     (< art article)))
-		       (if (and (numberp art) 
+		       (if (and (numberp art)
 				(file-exists-p
 				 (gnus-agent-article-name
 				  (number-to-string art) group)))
@@ -1528,9 +1620,9 @@ The following commands are available:
 		     ;; Schedule the history line for nuking.
 		     (push (cdr elem) histories)))
 		 (gnus-make-directory (file-name-directory nov-file))
-		 (let ((coding-system-for-write
-			gnus-agent-file-coding-system))
-		   (write-region (point-min) (point-max) nov-file nil 'silent))
+		 (write-region-as-coding-system
+		  gnus-agent-file-coding-system
+		  (point-min) (point-max) nov-file nil 'silent)
 		 ;; Delete the unwanted entries in the alist.
 		 (setq gnus-agent-article-alist
 		       (sort gnus-agent-article-alist 'car-less-than-car))
@@ -1588,8 +1680,7 @@ The following commands are available:
 		(gnus-delete-line))
 	      (gnus-agent-save-history)
 	      (gnus-agent-close-history)
-	      (gnus-write-active-file
-	       (gnus-agent-lib-file "active") orig))
+	      (gnus-write-active-file (gnus-agent-lib-file "active") orig))
 	    (gnus-message 4 "Expiry...done")))))))
 
 ;;;###autoload