Merge changes made in Gnus trunk.

shr.el (shr-render-td): Store the actual background colour used.
gnus-sum.el (gnus-user-date): Renamed back from gnus-summary-user-date since user code refers to it.
auth-source.el: Rewrite.
gnus.texi: Add DEVEL header (suggested by Andreas Schwab).
WEBHACKDEVEL work:
 Makefile.in (webhack, nowebhack): Hacks to produce for-the-web manuals.
 auth.texi: Use WEBHACKDEVEL.
 emacs-mime.texi: Use WEBHACKDEVEL.
 gnus.texi: Use WEBHACKDEVEL.
 message.texi: Use WEBHACKDEVEL.
 pgg.texi: Use WEBHACKDEVEL.
 sasl.texi: Use WEBHACKDEVEL.
 sieve.texi: Use WEBHACKDEVEL.
 overrides.texi: New file to set or clear WEBHACKDEVEL.
message.el (message-setup-1): Remove the read-only stuff, since it doesn't work under XEmacs, for some reason.

4 files changed, 20 insertions, 12 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 02ec82d06a0..ceef5e5df2b 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,13 @@
 2011-02-04  Lars Ingebrigtsen  <larsi@gnus.org>
 
+        * message.el (message-setup-1): Remove the read-only stuff, since it
+        doesn't work under XEmacs, for some reason.
+
+        * gnus-sum.el (gnus-user-date): Renamed back from
+        gnus-summary-user-date since user code refers to it.
+
+        * shr.el (shr-render-td): Store the actual background colour used.
+
         * message.el (message-setup-1): Don't bind the constant
         -forbidden-properties.
         (message-setup-1): Revert previous change, since it needs to bind the
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index c40fcc7fe13..8221667ab65 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -1395,7 +1395,7 @@ the normal Gnus MIME machinery."
     (?u gnus-tmp-user-defined ?s)
     (?P (gnus-pick-line-number) ?d)
     (?B gnus-tmp-thread-tree-header-string ?s)
-    (user-date (gnus-summary-user-date
+    (user-date (gnus-user-date
                 ,(macroexpand '(mail-header-date gnus-tmp-header))) ?s))
   "An alist of format specifications that can appear in summary lines.
 These are paired with what variables they correspond with, along with
@@ -3882,7 +3882,7 @@ respectively."
 (make-obsolete-variable 'gnus-user-date-format-alist
                         'gnus-summary-user-date-format-alist "24.1")
 
-(defun gnus-summary-user-date (messy-date)
+(defun gnus-user-date (messy-date)
   "Format the messy-date according to `gnus-summary-user-date-format-alist'.
 Returns \"  ?  \" if there's bad input or if another error occurs.
 Input should look like this: \"Sun, 14 Oct 2001 13:34:39 +0200\"."
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 5c24bc886bc..37d64bc5f1b 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -6411,9 +6411,7 @@ are not included."
          (funcall message-default-headers)
        message-default-headers))
     (or (bolp) (insert ?\n)))
-  (let ((message-forbidden-properties nil))
-    (insert (propertize (concat mail-header-separator "\n")
-                        'read-only t 'rear-nonsticky t 'intangible t)))
+  (insert (concat mail-header-separator "\n"))
   (forward-line -1)
   ;; If a crash happens while replying, the auto-save file would *not* have a
   ;; `References:' header if `message-generate-headers-first' was nil.
diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index 10e04a87d93..5b4e6c7389d 100644
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -601,7 +601,8 @@ ones, in case fg and bg are nil."
         (when fg
           (shr-put-color start end :foreground (cadr new-colors)))
         (when bg
-          (shr-put-color start end :background (car new-colors)))))))
+          (shr-put-color start end :background (car new-colors))))
+      new-colors)))
 
 ;; Put a color in the region, but avoid putting colors on on blank
 ;; text at the start of the line, and the newline at the end, to avoid
@@ -1126,7 +1127,7 @@ ones, in case fg and bg are nil."
           (fgcolor (cdr (assq :fgcolor cont)))
           (style (cdr (assq :style cont)))
           (shr-stylesheet shr-stylesheet)
-          overlays)
+          overlays actual-colors)
       (when style
         (setq style (and (string-match "color" style)
                          (shr-parse-style style))))
@@ -1178,16 +1179,17 @@ ones, in case fg and bg are nil."
                 (insert (make-string (- width (current-column)) ? )))
               (forward-line 1)))
           (when style
-            (shr-colorize-region
-             (point-min) (point-max)
-             (cdr (assq 'color shr-stylesheet))
-             (cdr (assq 'background-color shr-stylesheet)))))
+            (setq actual-colors
+                  (shr-colorize-region
+                   (point-min) (point-max)
+                   (cdr (assq 'color shr-stylesheet))
+                   (cdr (assq 'background-color shr-stylesheet))))))
         (if fill
             (list max
                   (count-lines (point-min) (point-max))
                   (split-string (buffer-string) "\n")
                   (shr-collect-overlays)
-                  (cdr (assq 'background-color shr-stylesheet)))
+                  (car actual-colors))
           (list max
                 (shr-natural-width)))))))