Apply Dave Love's new patch.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5be80db..0b48216 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+1999-12-12  Dave Love  <fx@gnu.org>
+
+       * gnus-agent.el (gnus-category-edit-groups)
+       (gnus-category-edit-score, gnus-category-edit-predicate): Replace
+       expansion of setf, fixed.
+       
 1999-12-12 12:50:30  Shenghuo ZHU  <zsh@cs.rochester.edu>
 
        * gnus-agent.el: Revoke last Dave Love's patch, because of

diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el
index 782f446..a794c46 100644 (file)
--- a/lisp/gnus-agent.el
+++ b/lisp/gnus-agent.el
@@ -1257,7 +1257,7 @@ The following commands are available:
     (gnus-edit-form
      (cadr info) (format "Editing the predicate for category %s" category)
      `(lambda (predicate)
-       (setf (cadr (assq ',category gnus-category-alist)) predicate)
+       (setcar (cdr (assq ',category gnus-category-alist)) predicate)
        (gnus-category-write)
        (gnus-category-list)))))
 
@@ -1269,7 +1269,7 @@ The following commands are available:
      (caddr info)
      (format "Editing the score expression for category %s" category)
      `(lambda (groups)
-       (setf (caddr (assq ',category gnus-category-alist)) groups)
+       (setcar (cddr (assq ',category gnus-category-alist)) groups)
        (gnus-category-write)
        (gnus-category-list)))))
 
@@ -1280,7 +1280,7 @@ The following commands are available:
     (gnus-edit-form
      (cadddr info) (format "Editing the group list for category %s" category)
      `(lambda (groups)
-       (setf (cadddr (assq ',category gnus-category-alist)) groups)
+       (setcar (nthcdr 3 (assq ',category gnus-category-alist)) groups)
        (gnus-category-write)
        (gnus-category-list)))))