(gnus-summary-initial-limit): Use unless instead of if.

(gnus-fetch-old-headers): Warn about setting it to t for Gmane groups.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4ebca3d..71f3591 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-24  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * gnus-sum.el (gnus-summary-initial-limit): Use unless instead of if.
+       (gnus-fetch-old-headers): Warn about setting it to t for Gmane groups.
+
 2008-05-20  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * auth-source.el: Add more docs.
@@ -14,7 +19,7 @@
        * pop3.el (pop3-movemail): Change the sit-for from 0.1 to 0.01, which
        seems to make mail retrieval much, much faster.
        (pop3-movemail): Use nnheader-accept-process-output instead of sleeping
-       unconditionally. 
+       unconditionally.
 
        * gnus-draft.el (gnus-group-send-queue): Bind
        message-send-mail-partially-limit to nil to avoid being prompted.

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index dbdc21d..7833ca5 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -89,7 +89,9 @@ old headers will be fetched, but none will be displayed.
 The server has to support NOV for any of this to work.
 
 This feature can seriously impact performance it ignores all
-locally cached header entries."
+locally cached header entries.  Setting it to t for groups for a
+server that doesn't expire articles (such as news.gmane.org),
+leads to very slow summary generation."
   :group 'gnus-thread
   :type '(choice (const :tag "off" nil)
                 (const :tag "on" t)
@@ -8596,18 +8598,17 @@ If ALL, mark even excluded ticked and dormants as read."
 This entails weeding out unwanted dormants, low-scored articles,
 fetch-old-headers verbiage, and so on."
   ;; Most groups have nothing to remove.
-  (if (or gnus-inhibit-limiting
-         (and (null gnus-newsgroup-dormant)
-              (eq gnus-newsgroup-display 'gnus-not-ignore)
-              (not (eq gnus-fetch-old-headers 'some))
-              (not (numberp gnus-fetch-old-headers))
-              (not (eq gnus-fetch-old-headers 'invisible))
-              (null gnus-summary-expunge-below)
-              (not (eq gnus-build-sparse-threads 'some))
-              (not (eq gnus-build-sparse-threads 'more))
-              (null gnus-thread-expunge-below)
-              (not gnus-use-nocem)))
-      ()                               ; Do nothing.
+  (unless (or gnus-inhibit-limiting
+             (and (null gnus-newsgroup-dormant)
+                  (eq gnus-newsgroup-display 'gnus-not-ignore)
+                  (not (eq gnus-fetch-old-headers 'some))
+                  (not (numberp gnus-fetch-old-headers))
+                  (not (eq gnus-fetch-old-headers 'invisible))
+                  (null gnus-summary-expunge-below)
+                  (not (eq gnus-build-sparse-threads 'some))
+                  (not (eq gnus-build-sparse-threads 'more))
+                  (null gnus-thread-expunge-below)
+                  (not gnus-use-nocem)))
     (push gnus-newsgroup-limit gnus-newsgroup-limits)
     (setq gnus-newsgroup-limit nil)
     (mapatoms