# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1211785047 0
# Node ID 300e5a5c5a1714eebf1e084791fbe2c09ee4b8cb
# Parent  65a4fcc1bc566bbc936adde31eed1e50fe3fea8d
Merge from gnus--devo--0

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

diff -r 65a4fcc1bc56 -r 300e5a5c5a17 doc/misc/ChangeLog
--- a/doc/misc/ChangeLog	Mon May 26 01:27:45 2008 +0000
+++ b/doc/misc/ChangeLog	Mon May 26 06:57:27 2008 +0000
@@ -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 -r 65a4fcc1bc56 -r 300e5a5c5a17 doc/misc/gnus.texi
--- a/doc/misc/gnus.texi	Mon May 26 01:27:45 2008 +0000
+++ b/doc/misc/gnus.texi	Mon May 26 06:57:27 2008 +0000
@@ -7071,6 +7071,14 @@
 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 -r 65a4fcc1bc56 -r 300e5a5c5a17 lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Mon May 26 01:27:45 2008 +0000
+++ b/lisp/gnus/ChangeLog	Mon May 26 06:57:27 2008 +0000
@@ -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 -r 65a4fcc1bc56 -r 300e5a5c5a17 lisp/gnus/gnus-sum.el
--- a/lisp/gnus/gnus-sum.el	Mon May 26 01:27:45 2008 +0000
+++ b/lisp/gnus/gnus-sum.el	Mon May 26 06:57:27 2008 +0000
@@ -89,7 +89,9 @@
 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 @@
 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