diff options
| author | Gnus developers <ding@gnus.org> | 2010-12-06 22:16:10 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2010-12-06 22:16:10 +0000 |
| commit | b31b26b48958fed0162d58c76dc55b2aeca22b66 (patch) | |
| tree | 4221b7cc8a36f0be7397ac3866f3241b5256ccf6 /lisp/gnus/nnimap.el | |
| parent | 67027b49796eec01dccf1e14d7b0497b2d484328 (diff) | |
| download | emacs-b31b26b48958fed0162d58c76dc55b2aeca22b66.tar.gz | |
Merge changes made in Gnus trunk.
shr.el (shr-render-td): Render td content with shr-descend, so style will be applied to <td> too.
(shr-colorize-region): Colorize region even if we only have a background.
(shr-tag-body): Fix color and background color inheritance.
(shr-tag-body): Do not recolorize after shr-generic.
(shr-tag-font): Let shr-generic colorize via inheritance.
shr.el (shr-descend): Only colorise something if we have a node that sets colors.
gnus-int.el (gnus-request-thread): Rework to take a header instead of a Message-ID to avoid having nnimap depend on gnus-sum.
shr.el (shr-tag-font): Colorize the region.
(shr-tag-body): Ditto.
(shr-tag-font): Actually let the styles be inherited instead of overwriting them.
(shr-tag-font): Get the background color right.
(shr-tag-style): Ignore all <style> tags for the moment.
Diffstat (limited to 'lisp/gnus/nnimap.el')
| -rw-r--r-- | lisp/gnus/nnimap.el | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el index 4b4793dcfee..c7d61399dec 100644 --- a/lisp/gnus/nnimap.el +++ b/lisp/gnus/nnimap.el @@ -47,9 +47,6 @@ (require 'nnmail) (require 'proto-stream) -(eval-when-compile - (require 'gnus-sum)) - (autoload 'auth-source-forget-user-or-password "auth-source") (autoload 'auth-source-user-or-password "auth-source") @@ -1426,9 +1423,10 @@ textual parts.") (setq nnimap-status-string "Read-only server") nil) -(deffoo nnimap-request-thread (id) - (let* ((refs (split-string - (or (mail-header-references (gnus-summary-article-header)) +(deffoo nnimap-request-thread (header) + (let* ((id (mail-header-id header)) + (refs (split-string + (or (mail-header-references header) ""))) (cmd (let ((value (format |