[Emacs-diffs] /srv/bzr/emacs/trunk r106940: Merge changes made in Gnus trunk

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 106940
author: Lars Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Thu 2012-01-26 10:43:01 +0000
message:
  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.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-sum.el
  lisp/gnus/nnimap.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2012-01-26 10:38:22 +0000
+++ b/lisp/gnus/ChangeLog       2012-01-26 10:43:01 +0000
@@ -3,6 +3,17 @@
        * gnus-sum.el (gnus-summary-mode): Force paragraph direction to be
        left-to-right.
 
+2012-01-26  Lars Ingebrigtsen  <address@hidden>
+
+       * nnimap.el (nnir-search-thread): Autoload to avoid a compilation
+       warning.
+
+2012-01-25  Lars Ingebrigtsen  <address@hidden>
+
+       * 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  <address@hidden>
 
        * mm-decode.el (mm-interactively-view-part): Fix prompt.

=== modified file 'lisp/gnus/gnus-sum.el'
--- a/lisp/gnus/gnus-sum.el     2012-01-26 10:38:22 +0000
+++ b/lisp/gnus/gnus-sum.el     2012-01-26 10:43:01 +0000
@@ -1371,15 +1371,12 @@
     (?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)

=== modified file 'lisp/gnus/nnimap.el'
--- a/lisp/gnus/nnimap.el       2012-01-19 07:21:25 +0000
+++ b/lisp/gnus/nnimap.el       2012-01-26 10:43:01 +0000
@@ -1610,6 +1610,8 @@
 (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)))