Merge from gnus--devo--0

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1178

4 files changed, 31 insertions, 13 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 9cb1746ce1f..1c7811cb440 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-24  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * gnus.texi (Filling In Threads): Additions to gnus-fetch-old-headers.
+
 2008-05-15  Reiner Steib  <Reiner.Steib@gmx.de>
 
         * gnus.texi (Scoring On Other Headers): Fix typo.  Rearrange.
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index e964129df84..8273be8f6da 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -7071,6 +7071,14 @@ This variable can also be set to @code{invisible}.  This won't have any
 visible effects, but is useful if you use the @kbd{A T} command a lot
 (@pxref{Finding the Parent}).
 
+The server has to support @acronym{NOV} for any of this to work.
+
+@cindex Gmane, gnus-fetch-old-headers
+This feature can seriously impact performance it ignores all locally
+cached header entries.  Setting it to @code{t} for groups for a server
+that doesn't expire articles (such as news.gmane.org), leads to very
+slow summary generation.
+
 @item gnus-fetch-old-ephemeral-headers
 @vindex gnus-fetch-old-ephemeral-headers
 Same as @code{gnus-fetch-old-headers}, but only used for ephemeral
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index bba83b6a034..391ff5b6b34 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/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.
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index dbdc21d8873..7833ca5aba0 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/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