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/nntp.el | |
| 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/nntp.el')
| -rw-r--r-- | lisp/gnus/nntp.el | 4 |
1 files changed, 2 insertions, 2 deletions
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 |