* gnus-topic.el (gnus-topic-indent, gnus-topic-unindent): Change

cdaar to cdar and car.

* nnsoup.el (nnsoup-retrieve-headers, nnsoup-request-type)
(nnsoup-read-active-file, nnsoup-article-to-area): Ditto.

3 files changed, 15 insertions, 7 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index c4f39d14251..bb2fe61255a 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,11 @@
+2002-07-06  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+        * gnus-topic.el (gnus-topic-indent, gnus-topic-unindent): Change
+        cdaar to cdar and car.
+
+        * nnsoup.el (nnsoup-retrieve-headers, nnsoup-request-type) 
+        (nnsoup-read-active-file, nnsoup-article-to-area): Ditto.
+
 2002-07-03  Juanma Barranquero  <lektu@terra.es>
 
         * gnus-sum.el (gnus-summary-highlight): Fix typo.
diff --git a/lisp/gnus/gnus-topic.el b/lisp/gnus/gnus-topic.el
index 3761dbc17b9..efc639ba8d9 100644
--- a/lisp/gnus/gnus-topic.el
+++ b/lisp/gnus/gnus-topic.el
@@ -1416,7 +1416,7 @@ If UNINDENT, remove an indentation."
         (gnus-topic-kill-group)
         (push (cdar gnus-topic-killed-topics) gnus-topic-alist)
         (gnus-topic-create-topic
-         topic parent nil (cdaar gnus-topic-killed-topics))
+         topic parent nil (cdar (car gnus-topic-killed-topics)))
         (pop gnus-topic-killed-topics)
         (or (gnus-topic-goto-topic topic)
             (gnus-topic-goto-topic parent))))))
@@ -1435,7 +1435,7 @@ If UNINDENT, remove an indentation."
       (push (cdar gnus-topic-killed-topics) gnus-topic-alist)
       (gnus-topic-create-topic
        topic grandparent (gnus-topic-next-topic parent)
-       (cdaar gnus-topic-killed-topics))
+       (cdar (car gnus-topic-killed-topics)))
       (pop gnus-topic-killed-topics)
       (gnus-topic-goto-topic topic))))
 
diff --git a/lisp/gnus/nnsoup.el b/lisp/gnus/nnsoup.el
index 93451d1adaf..9a119fe287c 100644
--- a/lisp/gnus/nnsoup.el
+++ b/lisp/gnus/nnsoup.el
@@ -114,7 +114,7 @@ backend for the messages.")
         ;; articles in SEQUENCE come from.
         (while (and areas sequence)
           ;; Peel off areas that are below sequence.
-          (while (and areas (< (cdaar areas) (car sequence)))
+          (while (and areas (< (cdar (car areas)) (car sequence)))
             (setq areas (cdr areas)))
           (when areas
             ;; This is a useful area.
@@ -130,7 +130,7 @@ backend for the messages.")
               (setq use-nov nil))
             ;; We assign the portion of `sequence' that is relevant to
             ;; this MSG packet to this packet.
-            (while (and sequence (<= (car sequence) (cdaar areas)))
+            (while (and sequence (<= (car sequence) (cdar (car areas))))
               (push (car sequence) this-area-seq)
               (setq sequence (cdr sequence)))
             (setcar useful-areas (cons (nreverse this-area-seq)
@@ -249,7 +249,7 @@ backend for the messages.")
   ;; Try to guess the type based on the first article in the group.
   (when (not article)
     (setq article
-          (cdaar (cddr (assoc group nnsoup-group-alist)))))
+          (cdar (car (cddr (assoc group nnsoup-group-alist))))))
   (if (not article)
       'unknown
     (let ((kind (gnus-soup-encoding-kind
@@ -371,7 +371,7 @@ backend for the messages.")
           (setq min (caaar e))
           (while (cdr e)
             (setq e (cdr e)))
-          (setq max (cdaar e))
+          (setq max (cdar (car e)))
           (setcdr entry (cons (cons min max) (cdr entry)))))
       (setq nnsoup-group-alist-touched t))
     nnsoup-group-alist))
@@ -651,7 +651,7 @@ backend for the messages.")
 (defun nnsoup-article-to-area (article group)
   "Return the area that ARTICLE in GROUP is located in."
   (let ((areas (cddr (assoc group nnsoup-group-alist))))
-    (while (and areas (< (cdaar areas) article))
+    (while (and areas (< (cdar (car areas)) article))
       (setq areas (cdr areas)))
     (and areas (car areas))))