gnus-agent.el: Indent.

gnus.texi: Fix a couple nnir -> @code{nnir} things.
nnimap.el (nnimap-retrieve-group-data-early): Fix the syntax of the QRESYNC command by deleting a superfluous space which broke Cyrus servers.  This change will break other servers that are buggy the other way around.
gnus.texi (The hyrex Engine): Say that this engine as obsolete.

5 files changed, 30 insertions, 17 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 05da55c49c0..1d46f385752 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2010-12-15  Andrew Cohen  <cohen@andy.bu.edu>
+
+        * gnus.texi (The hyrex Engine): Say that this engine as obsolete.
+
 2010-12-14  Andrew Cohen  <cohen@andy.bu.edu>
 
         * gnus.texi (The swish++ Engine): Add customizable parameters
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 16b8acd47d8..612f0296d90 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -793,7 +793,7 @@ Searching
 
 nnir
 
-* What is nnir::                What does nnir do.
+* What is nnir?::               What does nnir do.
 * Basic Usage::                 How to perform simple searches.
 * Setting up nnir::             How to set up nnir.
 
@@ -21026,24 +21026,25 @@ This section describes how to use @code{nnir} to search for articles
 within gnus.
 
 @menu
-* What is nnir::                What does nnir do?
+* What is nnir?::               What does @code{nnir} do?
 * Basic Usage::                 How to perform simple searches.
-* Setting up nnir::             How to set up nnir.
+* Setting up nnir::             How to set up @code{nnir}.
 @end menu
 
-@node What is nnir
-@subsection What is nnir
+@node What is nnir?
+@subsection What is nnir?
 
-@code{nnir} is a gnus interface to a number of tools for searching
+@code{nnir} is a Gnus interface to a number of tools for searching
 through mail and news repositories. Different backends (like
 @code{nnimap} and @code{nntp}) work with different tools (called
-@dfn{engines} in nnir lingo), but all use the same basic search
+@dfn{engines} in @code{nnir} lingo), but all use the same basic search
 interface.
 
 The @code{nnimap} and @code{gmane} search engines should work with no
 configuration. Other engines require a local index that needs to be
 created and maintained outside of Gnus. 
 
+
 @node Basic Usage
 @subsection Basic Usage
 
@@ -21083,6 +21084,7 @@ to @code{gnus-group-make-nnir-group}. If you are searching multiple
 groups with different search engines you will be prompted for the
 special search features for each engine separately. 
 
+
 @node Setting up nnir
 @subsection Setting up nnir
 
@@ -21120,10 +21122,10 @@ name. For example to use the @code{namazu} engine to search the server
 named @code{home} you can use
 
 @lisp
-(setq gnus-secondary-select-methods '(
-      (nnml "home" 
-            (nnimap-address "localhost")
-            (nnir-search-engine namazu))))
+(setq gnus-secondary-select-methods
+      '((nnml "home" 
+         (nnimap-address "localhost")
+         (nnir-search-engine namazu))))
 @end lisp
 
 Alternatively you might want to use a particular engine for all servers
@@ -21335,7 +21337,7 @@ this command periodically, say every four hours.
 
 @node The hyrex Engine
 @subsubsection The hyrex Engine
-FIXME: Add documentation.
+This engine is obsolete.
 
 @node Customizations
 @subsubsection Custimozations
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 013c7ee4c74..e416abf6d77 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,10 @@
+2010-12-15  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * nnimap.el (nnimap-retrieve-group-data-early): Fix the syntax of the
+        QRESYNC command by deleting a superfluous space which broke Cyrus
+        servers.  This change will break other servers that are buggy the other
+        way around.
+
 2010-12-14  Teodor Zlatanov  <tzz@lifelogs.com>
 
         * spam.el: Reindent and fix long lines.
diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el
index fbd86f2e6f5..6dc1f51cd9c 100644
--- a/lisp/gnus/gnus-agent.el
+++ b/lisp/gnus/gnus-agent.el
@@ -1513,7 +1513,7 @@ downloaded into the agent."
   "Fetch ARTICLES from GROUP and put them into the Agent."
   (when articles
     (gnus-agent-load-alist group)
-    (let* ((alist   gnus-agent-article-alist)
+    (let* ((alist gnus-agent-article-alist)
            (headers (if (< (length articles) 2) nil gnus-newsgroup-headers))
            (selected-sets (list nil))
            (current-set-size 0)
@@ -1555,9 +1555,9 @@ downloaded into the agent."
                                       ;; 65 char/line.  If the line count
                                       ;; is missing, arbitrarily assume a
                                       ;; size of 1000 characters.
-                                    (max (* 65 (mail-header-lines
-                                                (car headers)))
-                                         1000)
+                                      (max (* 65 (mail-header-lines
+                                                  (car headers)))
+                                           1000)
                                     char-size))
                               0))))
             (setcar selected-sets (nreverse (car selected-sets)))
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index 0462cf946eb..ae1929d1bd5 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -1080,7 +1080,7 @@ textual parts.")
                    uidvalidity
                    modseq)
               (push
-               (list (nnimap-send-command "EXAMINE %S (QRESYNC  (%s %s))"
+               (list (nnimap-send-command "EXAMINE %S (QRESYNC (%s %s))"
                                           (utf7-encode group t)
                                           uidvalidity modseq)
                      'qresync