Merge branch 'master' of https://git.gnus.org/gnus into tzz-auth-source-rewrite

Conflicts:
	lisp/ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 31975c1..ec7910e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -20,6 +20,16 @@
        * password-cache.el (password-cache-remove): Accept secrets that are
        not strings.
 
+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  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * mail-source.el: Autoload `auth-source-search'.
@@ -38,6 +48,9 @@
 
 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  Teodor Zlatanov  <tzz@lifelogs.com>

diff --git a/lisp/message.el b/lisp/message.el
index 46c25c8..fe05bd1 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -1858,7 +1858,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/nntp.el b/lisp/nntp.el
index 173eda6..1b3023a 100644 (file)
--- a/lisp/nntp.el
+++ b/lisp/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)
@@ -792,7 +792,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/shr.el b/lisp/shr.el
index 5b4e6c7..bb9695e 100644 (file)
--- a/lisp/shr.el
+++ b/lisp/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))))