Merge changes made in Gnus trunk

nnimap.el (nnir-search-thread): Autoload to avoid a compilation warning.
gnus-sum.el (gnus-summary-line-format-alist): Don't try to macroexpand the nnir things, since they haven't been defined yet, and nnir requires gnus-sum.

3 files changed, 17 insertions, 7 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index cdcdac87022..9329188fc00 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -3,6 +3,17 @@
         * gnus-sum.el (gnus-summary-mode): Force paragraph direction to be
         left-to-right.
 
+2012-01-26  Lars Ingebrigtsen  <larsi@gnus.org>
+
+        * nnimap.el (nnir-search-thread): Autoload to avoid a compilation
+        warning.
+
+2012-01-25  Lars Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus-sum.el (gnus-summary-line-format-alist): Don't try to
+        macroexpand the nnir things, since they haven't been defined yet, and
+        nnir requires gnus-sum.
+
 2012-01-21  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * mm-decode.el (mm-interactively-view-part): Fix prompt.
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 50178596e6c..26bd5b0bddc 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -1371,15 +1371,12 @@ the normal Gnus MIME machinery."
     (?c (or (mail-header-chars gnus-tmp-header) 0) ?d)
     (?k (gnus-summary-line-message-size gnus-tmp-header) ?s)
     (?L gnus-tmp-lines ?s)
-    (?Z (or ,(gnus-macroexpand-all
-              '(nnir-article-rsv (mail-header-number gnus-tmp-header)))
+    (?Z (or (nnir-article-rsv (mail-header-number gnus-tmp-header))
             0) ?d)
-    (?G (or ,(gnus-macroexpand-all
-              '(nnir-article-group (mail-header-number gnus-tmp-header)))
+    (?G (or (nnir-article-group (mail-header-number gnus-tmp-header))
             "") ?s)
-    (?g (or ,(gnus-macroexpand-all
-              '(gnus-group-short-name
-                (nnir-article-group (mail-header-number gnus-tmp-header))))
+    (?g (or (gnus-group-short-name
+             (nnir-article-group (mail-header-number gnus-tmp-header)))
             "") ?s)
     (?O gnus-tmp-downloaded ?c)
     (?I gnus-tmp-indentation ?s)
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index 0b0fc918c87..0df7ffce671 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -1610,6 +1610,8 @@ textual parts.")
 (declare-function gnus-fetch-headers "gnus-sum"
                   (articles &optional limit force-new dependencies))
 
+(autoload 'nnir-search-thread "nnir")
+
 (deffoo nnimap-request-thread (header &optional group server)
   (when group
     (setq group (nnimap-decode-gnus-group group)))