Merge from gnus--devo--0

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

4 files changed, 21 insertions, 9 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index aad32e53e2f..80af3824e05 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -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 --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 98df2c3bba6..e964129df84 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -21431,7 +21431,14 @@ other headers requires writing a @code{head} scoring rule, which means
 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 @@ so: @kbd{I e s p To RET <your name> RET}.
 
 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 --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index cb4c451c7de..f8dffcd8a29 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -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 --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index ccd65e51132..6cf571d6222 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -1016,7 +1016,6 @@ Used by `message-yank-original' via `message-yank-cite'."
   :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