Fix nnir/gnus-sum mutually recursive requirements

* 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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c202102..d104c10 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+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-24  Julien Danjou  <julien@danjou.info>
 
        * color.el (color-rgb-to-hsl): Fix value computing.

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 878a96b..9b7098c 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/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)