[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r103202: Merge changes made in Gnus t
From: |
Katsumi Yamaoka |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r103202: Merge changes made in Gnus trunk. |
Date: |
Wed, 09 Feb 2011 22:16:29 +0000 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 103202
author: Gnus developers <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Wed 2011-02-09 22:16:29 +0000
message:
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.
modified:
lisp/gnus/ChangeLog
lisp/gnus/message.el
lisp/gnus/nntp.el
lisp/gnus/shr.el
=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog 2011-02-08 12:03:14 +0000
+++ b/lisp/gnus/ChangeLog 2011-02-09 22:16:29 +0000
@@ -1,5 +1,18 @@
+2011-02-09 Lars Ingebrigtsen <address@hidden>
+
+ * 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 <address@hidden>
+
+ * message.el (message-options): Make message-options really buffer
+ local.
+
2011-02-08 Julien Danjou <address@hidden>
+ * 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 <address@hidden>
=== modified file 'lisp/gnus/message.el'
--- a/lisp/gnus/message.el 2011-02-08 12:03:14 +0000
+++ b/lisp/gnus/message.el 2011-02-09 22:16:29 +0000
@@ -1814,7 +1814,7 @@
(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.")
=== modified file 'lisp/gnus/nntp.el'
--- a/lisp/gnus/nntp.el 2011-02-06 22:27:28 +0000
+++ b/lisp/gnus/nntp.el 2011-02-09 22:16:29 +0000
@@ -774,7 +774,7 @@
(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 @@
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
=== modified file 'lisp/gnus/shr.el'
--- a/lisp/gnus/shr.el 2011-02-05 00:11:16 +0000
+++ b/lisp/gnus/shr.el 2011-02-09 22:16:29 +0000
@@ -696,7 +696,8 @@
(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))))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r103202: Merge changes made in Gnus trunk.,
Katsumi Yamaoka <=