Synch to No Gnus 200407070236.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 80c1ac1..8130310 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2004-07-06  Dan Christensen  <jdc@uwo.ca>
+
+       * gnus-sum.el (gnus-summary-read-group-1): When summary
+       is unthreaded, respect display group parameter.
+       (gnus-articles-to-read): Remove unused reference to
+       display group parameter.
+
 2004-07-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * nnheader.el (nnheader-uniquify-message-id): New experimental

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 3298150..6fa4fb1 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -3606,16 +3606,10 @@ If SHOW-ALL is non-nil, already read articles are also listed."
       (when gnus-build-sparse-threads
        (gnus-build-sparse-threads))
       ;; Find the initial limit.
-      (if gnus-show-threads
-         (if show-all
-             (let ((gnus-newsgroup-dormant nil))
-               (gnus-summary-initial-limit show-all))
+      (if show-all
+         (let ((gnus-newsgroup-dormant nil))
            (gnus-summary-initial-limit show-all))
-       ;; When unthreaded, all articles are always shown.
-       (setq gnus-newsgroup-limit
-             (mapcar
-              (lambda (header) (mail-header-number header))
-              gnus-newsgroup-headers)))
+       (gnus-summary-initial-limit show-all))
       ;; Generate the summary buffer.
       (unless no-display
        (gnus-summary-prepare))
@@ -5298,8 +5292,7 @@ If SELECT-ARTICLES, only select those articles from GROUP."
 
 (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))
-        (articles
+  (let* ((articles
          ;; Select all articles if `read-all' is non-nil, or if there
          ;; are no unread articles.
          (if (or read-all