[Emacs-diffs] Changes to emacs/lisp/gnus/nnsoup.el

[ShengHuo ZHU]

Index: emacs/lisp/gnus/nnsoup.el
diff -c emacs/lisp/gnus/nnsoup.el:1.5 emacs/lisp/gnus/nnsoup.el:1.6
*** emacs/lisp/gnus/nnsoup.el:1.5       Tue Sep 19 09:37:09 2000
--- emacs/lisp/gnus/nnsoup.el   Sat Jul  6 09:15:21 2002
***************
*** 114,120 ****
        ;; articles in SEQUENCE come from.
        (while (and areas sequence)
          ;; Peel off areas that are below sequence.
!         (while (and areas (< (cdaar areas) (car sequence)))
            (setq areas (cdr areas)))
          (when areas
            ;; This is a useful area.
--- 114,120 ----
        ;; articles in SEQUENCE come from.
        (while (and areas sequence)
          ;; Peel off areas that are below sequence.
!         (while (and areas (< (cdar (car areas)) (car sequence)))
            (setq areas (cdr areas)))
          (when areas
            ;; This is a useful area.
***************
*** 130,136 ****
              (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)))
              (push (car sequence) this-area-seq)
              (setq sequence (cdr sequence)))
            (setcar useful-areas (cons (nreverse this-area-seq)
--- 130,136 ----
              (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) (cdar (car areas))))
              (push (car sequence) this-area-seq)
              (setq sequence (cdr sequence)))
            (setcar useful-areas (cons (nreverse this-area-seq)
***************
*** 249,255 ****
    ;; 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)))))
    (if (not article)
        'unknown
      (let ((kind (gnus-soup-encoding-kind
--- 249,255 ----
    ;; Try to guess the type based on the first article in the group.
    (when (not article)
      (setq article
!         (cdar (car (cddr (assoc group nnsoup-group-alist))))))
    (if (not article)
        'unknown
      (let ((kind (gnus-soup-encoding-kind
***************
*** 371,377 ****
          (setq min (caaar e))
          (while (cdr e)
            (setq e (cdr e)))
!         (setq max (cdaar e))
          (setcdr entry (cons (cons min max) (cdr entry)))))
        (setq nnsoup-group-alist-touched t))
      nnsoup-group-alist))
--- 371,377 ----
          (setq min (caaar e))
          (while (cdr e)
            (setq e (cdr e)))
!         (setq max (cdar (car e)))
          (setcdr entry (cons (cons min max) (cdr entry)))))
        (setq nnsoup-group-alist-touched t))
      nnsoup-group-alist))
***************
*** 651,657 ****
  (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))
        (setq areas (cdr areas)))
      (and areas (car areas))))
  
--- 651,657 ----
  (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 (< (cdar (car areas)) article))
        (setq areas (cdr areas)))
      (and areas (car areas))))