diff -c -r1.1.1.14 gnus-sum.el *** gnus-sum.el 1998/03/09 17:49:04 1.1.1.14 --- gnus-sum.el 1998/03/09 17:50:02 *************** *** 3897,3914 **** (defun gnus-articles-to-read (group &optional read-all) ;; Find out what articles the user wants to read. ! (let* ((articles ;; Select all articles if `read-all' is non-nil, or if there ;; are no unread articles. ! (if (or read-all ! (and (zerop (length gnus-newsgroup-marked)) ! (zerop (length gnus-newsgroup-unreads))) ! (eq (gnus-group-find-parameter group 'display) ! 'all)) ! (gnus-uncompress-range (gnus-active group)) (sort (append gnus-newsgroup-dormant gnus-newsgroup-marked (copy-sequence gnus-newsgroup-unreads)) ! '<))) (scored-list (gnus-killed-articles gnus-newsgroup-killed articles)) (scored (length scored-list)) (number (length articles)) --- 3905,3956 ---- (defun gnus-articles-to-read (group &optional read-all) ;; Find out what articles the user wants to read. ! (let* ((display (gnus-group-find-parameter group 'display)) ! tmparticles artmark ! (articles ;; Select all articles if `read-all' is non-nil, or if there ;; are no unread articles. ! (cond ! ((or read-all ! (and (zerop (length gnus-newsgroup-marked)) ! (zerop (length gnus-newsgroup-unreads))) ! (eq display 'all)) ! (gnus-uncompress-range (gnus-active group))) ! ((stringp display) ! (message gnus-newsgroup-headers) ! (setq tmparticles (gnus-uncompress-range (gnus-active group))) ! (setq articles nil) ! (if (string-equal (substring display 0 1) "-") ! (progn ! (setq display (substring display 1)) ! (while (not (null tmparticles)) ! (setq artmark ! (char-to-string ! (gnus-article-mark (car tmparticles)))) ! (if (or (not artmark) ! (not (string-match artmark display))) ! (setq articles ! (append (list (car tmparticles)) articles))) ! (setq tmparticles (cdr tmparticles)))) ! (while (not (null tmparticles)) ! (setq artmark ! (char-to-string (gnus-article-mark (car tmparticles)))) ! (if (and artmark (string-match artmark display)) ! (setq articles ! (append (list (car tmparticles)) articles))) ! (setq tmparticles (cdr tmparticles)))) ! articles) ! ((eq display 'not-expired) ! (setq articles (gnus-uncompress-range (gnus-active group))) ! (setq tmparticles gnus-newsgroup-expirable) ! (while (not (null tmparticles)) ! (setq articles (delq (car tmparticles) articles)) ! (setq tmparticles (cdr tmparticles))) ! articles) ! (t (sort (append gnus-newsgroup-dormant gnus-newsgroup-marked (copy-sequence gnus-newsgroup-unreads)) ! '<)))) (scored-list (gnus-killed-articles gnus-newsgroup-killed articles)) (scored (length scored-list)) (number (length articles))