# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1210903517 0
# Node ID 2f9176381b29f44eee9ca78c2b27beba9667d290
# Parent  8a7c995a19c30a241b4200c5d59f0ac675120c25
Merge from gnus--devo--0

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

diff -r 8a7c995a19c3 -r 2f9176381b29 doc/misc/ChangeLog
--- a/doc/misc/ChangeLog	Fri May 16 01:29:55 2008 +0000
+++ b/doc/misc/ChangeLog	Fri May 16 02:05:17 2008 +0000
@@ -1,3 +1,7 @@
+2008-05-15  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* gnus.texi (Scoring On Other Headers): Fix typo.  Rearrange.
+
 2008-05-15  Jonathan Yavner  <jyavner@member.fsf.org>
 
 	* ses.texi (Acknowledgements): Add Shigeru Fukaya.
@@ -30,6 +34,10 @@
 
 2008-04-13  Reiner Steib  <Reiner.Steib@gmx.de>
 
+	* gnus.texi (Searching, nnir.el, nnmairix.el): New nodes.
+
+2008-04-13  Reiner Steib  <Reiner.Steib@gmx.de>
+
 	* gnus.texi (Oort Gnus): Add message-fill-column.
 
 2008-04-12  Adrian Aichner  <adrian@xemacs.org>
diff -r 8a7c995a19c3 -r 2f9176381b29 doc/misc/gnus.texi
--- a/doc/misc/gnus.texi	Fri May 16 01:29:55 2008 +0000
+++ b/doc/misc/gnus.texi	Fri May 16 02:05:17 2008 +0000
@@ -21431,7 +21431,14 @@
 that Gnus has to request every single article from the back end to find
 matches.  This takes a long time in big groups.
 
-Now, there's not much you can do about this for news groups, but for
+@vindex gnus-inhibit-slow-scoring
+You can inhibit this slow scoring on headers or body by setting the
+variable @code{gnus-inhibit-slow-scoring}.  If
+@code{gnus-inhibit-slow-scoring} is regexp, slow scoring is inhibited if
+the group matches the regexp.  If it is t, slow scoring on it is
+inhibited for all groups.
+
+Now, there's not much you can do about the slowness for news groups, but for
 mail groups, you have greater control.  In @ref{To From Newsgroups},
 it's explained in greater detail what this mechanism does, but here's
 a cookbook example for @code{nnml} on how to allow scoring on the
@@ -21453,13 +21460,6 @@
 
 See?  Simple.
 
-@vindex gnus-inhibit-slow-scoring
-You can inhibit scoring the slow scoring on headers or body by setting
-the variable @code{gnus-inhibit-slow-scoring}.  If
-@code{gnus-inhibit-slow-scoring} is regexp, slow scoring is inhibited if
-the group matches the regexp.  If it is t, slow scoring on it is
-inhibited for all groups.
-
 
 @node Scoring Tips
 @section Scoring Tips
diff -r 8a7c995a19c3 -r 2f9176381b29 lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Fri May 16 01:29:55 2008 +0000
+++ b/lisp/gnus/ChangeLog	Fri May 16 02:05:17 2008 +0000
@@ -1,3 +1,8 @@
+2008-05-15  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* message.el (message-cite-function): Remove bogus autoload which crept
+	in during merge from v5-10.
+
 2008-05-14  Teodor Zlatanov  <tzz@lifelogs.com>
 
 	* nnimap.el (nnimap-open-connection): Fix login/password bug.
diff -r 8a7c995a19c3 -r 2f9176381b29 lisp/gnus/message.el
--- a/lisp/gnus/message.el	Fri May 16 01:29:55 2008 +0000
+++ b/lisp/gnus/message.el	Fri May 16 02:05:17 2008 +0000
@@ -1016,7 +1016,6 @@
   :link '(custom-manual "(message)Insertion Variables")
   :type 'integer)
 
-;;;###autoload
 (defcustom message-cite-function 'message-cite-original-without-signature
   "*Function for citing an original message.
 Predefined functions include `message-cite-original' and