Synch to Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 00b6e86..1205424 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-06  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus-cus.el (gnus-group-customize): Don't use delete-if which is
+       a cl run-time function.
+
 2003-03-06  Kevin Greiner  <kgreiner@xpediantsolutions.com>
 
        * gnus-agent.el (gnus-agent-fetch-group-1): Added missing binding

diff --git a/lisp/gnus-cus.el b/lisp/gnus-cus.el
index cc1006b..9de3266 100644 (file)
--- a/lisp/gnus-cus.el
+++ b/lisp/gnus-cus.el
@@ -393,24 +393,21 @@ DOC is a documentation string for the parameter."))
     (widget-insert ".\n\n")
     (make-local-variable 'gnus-custom-params)
 
-    (let* ((values (if group
-                           (gnus-info-params info)
-                         (gnus-topic-parameters topic))))
+    (let ((values (if group
+                     (gnus-info-params info)
+                   (gnus-topic-parameters topic))))
 
       ;; The parameters in values may contain duplicates.  This is
       ;; normally OK as assq returns the first. However, right here
       ;; every duplicate ends up being displayed.  So, rather than
       ;; display them, remove them from the list.
 
-      (let (tmp)
-        (setq values (gnus-copy-sequence values)
-              tmp values)
-
-        (while tmp
-          (setcdr tmp (delete-if (lambda (testing) (eq (caar tmp)
-                                                       (car testing))) 
-                                 (cdr tmp)))
-          (setq tmp (cdr tmp))))
+      (let ((tmp (setq values (gnus-copy-sequence values)))
+           elem)
+       (while (cdr tmp)
+         (while (setq elem (assq (caar tmp) (cdr tmp)))
+           (delq elem tmp))
+         (setq tmp (cdr tmp))))
 
       (setq gnus-custom-params
             (apply 'widget-create 'group