diff options
| author | Gnus developers <ding@gnus.org> | 2011-02-09 22:16:29 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2011-02-09 22:16:29 +0000 |
| commit | af4e5f4c5f03cf546e69e33a7103f73381f7c9ea (patch) | |
| tree | e2527d7126117986a21a2bf769bd2ae4481d8ae7 /lisp/gnus | |
| parent | d37f40ed383c9244d499c3770f9649d2399d40ba (diff) | |
| download | emacs-af4e5f4c5f03cf546e69e33a7103f73381f7c9ea.tar.gz | |
Merge changes made in Gnus trunk.
nntp.el (nntp-retrieve-group-data-early-disabled): Disable the async code for now, since it doesn't work for all users.
message.el (message-options): Make message-options really buffer local.
shr.el (shr-tag-body): Add support for text attribute in body markups.
Diffstat (limited to 'lisp/gnus')
| -rw-r--r-- | lisp/gnus/ChangeLog | 13 | ||||
| -rw-r--r-- | lisp/gnus/message.el | 2 | ||||
| -rw-r--r-- | lisp/gnus/nntp.el | 4 | ||||
| -rw-r--r-- | lisp/gnus/shr.el | 3 |
4 files changed, 18 insertions, 4 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 706b8f095b2..ba4d270951b 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,5 +1,18 @@ +2011-02-09 Lars Ingebrigtsen <larsi@gnus.org> + + * nntp.el (nntp-retrieve-group-data-early-disabled): Disable the async + code for now, since it doesn't work for all users. + +2011-02-09 Julien Danjou <julien@danjou.info> + + * message.el (message-options): Make message-options really buffer + local. + 2011-02-08 Julien Danjou <julien@danjou.info> + * shr.el (shr-tag-body): Add support for text attribute in body + markups. + * message.el (message-options): Make message-options a local variable. 2011-02-07 Lars Ingebrigtsen <larsi@gnus.org> diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index 6f4f04792fb..e30f7f2c973 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -1814,7 +1814,7 @@ You must have the \"hashcash\" binary installed, see `hashcash-path'." (defvar message-options nil "Some saved answers when sending message.") -(make-local-variable 'message-options) +(make-variable-buffer-local 'message-options) (defvar message-send-mail-real-function nil "Internal send mail function.") diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el index 0e009b2068b..eb2dd004638 100644 --- a/lisp/gnus/nntp.el +++ b/lisp/gnus/nntp.el @@ -774,7 +774,7 @@ command whose response triggered the error." (nntp-copy-to-buffer nntp-server-buffer (point-min) (point-max)) 'headers))))) -(deffoo nntp-retrieve-group-data-early (server infos) +(deffoo nntp-retrieve-group-data-early-disabled (server infos) "Retrieve group info on INFOS." (nntp-with-open-group nil server (when (nntp-find-connection-buffer nntp-server-buffer) @@ -793,7 +793,7 @@ command whose response triggered the error." nil command (gnus-group-real-name (gnus-info-group info))))) (length infos))))) -(deffoo nntp-finish-retrieve-group-infos (server infos count) +(deffoo nntp-finish-retrieve-group-infos-disabled (server infos count) (nntp-with-open-group nil server (let ((buf (nntp-find-connection-buffer nntp-server-buffer)) (method (gnus-find-method-for-group diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el index 5b4e6c7389d..bb9695ebb72 100644 --- a/lisp/gnus/shr.el +++ b/lisp/gnus/shr.el @@ -696,7 +696,8 @@ ones, in case fg and bg are nil." (defun shr-tag-body (cont) (let* ((start (point)) - (fgcolor (cdr (assq :fgcolor cont))) + (fgcolor (cdr (or (assq :fgcolor cont) + (assq :text cont)))) (bgcolor (cdr (assq :bgcolor cont))) (shr-stylesheet (list (cons 'color fgcolor) (cons 'background-color bgcolor)))) |