[Emacs-diffs] /srv/bzr/emacs/trunk r103117: Merge changes made in Gnus trunk.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 103117
author: Gnus developers <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Sat 2011-02-05 00:11:16 +0000
message:
  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.
added:
  doc/misc/overrides.texi
modified:
  doc/misc/ChangeLog
  doc/misc/auth.texi
  doc/misc/emacs-mime.texi
  doc/misc/gnus.texi
  doc/misc/message.texi
  doc/misc/pgg.texi
  doc/misc/sasl.texi
  doc/misc/sieve.texi
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-sum.el
  lisp/gnus/message.el
  lisp/gnus/shr.el

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2011-02-03 19:29:10 +0000
+++ b/doc/misc/ChangeLog        2011-02-05 00:11:16 +0000
@@ -1,3 +1,28 @@
+2011-02-04  Teodor Zlatanov  <address@hidden>
+
+       * overrides.texi: New file to set or clear WEBHACKDEVEL.
+
+       * sieve.texi: Use WEBHACKDEVEL.
+
+       * sasl.texi: Use WEBHACKDEVEL.
+
+       * pgg.texi: Use WEBHACKDEVEL.
+
+       * message.texi: Use WEBHACKDEVEL.
+
+       * gnus.texi: Use WEBHACKDEVEL.
+
+       * emacs-mime.texi: Use WEBHACKDEVEL.
+
+       * auth.texi: Use WEBHACKDEVEL.
+
+       * Makefile.in (webhack, nowebhack): Hacks to produce for-the-web
+       manuals.
+
+2011-02-04  Lars Ingebrigtsen  <address@hidden>
+
+       * gnus.texi: Add DEVEL header (suggested by Andreas Schwab).
+
 2011-02-03  Paul Eggert  <address@hidden>
 
        * texinfo.tex: Update to version 2011-02-01.10 from gnulib,

=== modified file 'doc/misc/auth.texi'
--- a/doc/misc/auth.texi        2011-01-25 04:08:28 +0000
+++ b/doc/misc/auth.texi        2011-02-05 00:11:16 +0000
@@ -1,4 +1,7 @@
 \input texinfo                  @c -*-texinfo-*-
+
address@hidden overrides.texi
+
 @setfilename ../../info/auth
 @settitle Emacs auth-source Library @value{VERSION}
 
@@ -35,7 +38,12 @@
 @end direntry
 
 @titlepage
address@hidden WEBHACKDEVEL
address@hidden Emacs auth-source Library (DEVELOPMENT VERSION)
address@hidden ifset
address@hidden WEBHACKDEVEL
 @title Emacs auth-source Library
address@hidden ifclear
 @author by Ted Zlatanov
 @page
 @vskip 0pt plus 1filll

=== modified file 'doc/misc/emacs-mime.texi'
--- a/doc/misc/emacs-mime.texi  2011-01-25 04:08:28 +0000
+++ b/doc/misc/emacs-mime.texi  2011-02-05 00:11:16 +0000
@@ -1,5 +1,7 @@
 \input texinfo
 
address@hidden overrides.texi
+
 @setfilename ../../info/emacs-mime
 @settitle Emacs MIME Manual
 @synindex fn cp
@@ -38,7 +40,12 @@
 @setchapternewpage odd
 
 @titlepage
address@hidden WEBHACKDEVEL
address@hidden Emacs MIME Manual (DEVELOPMENT VERSION)
address@hidden ifset
address@hidden WEBHACKDEVEL
 @title Emacs MIME Manual
address@hidden ifclear
 
 @author by Lars Magne Ingebrigtsen
 @page

=== modified file 'doc/misc/gnus.texi'
--- a/doc/misc/gnus.texi        2011-02-03 23:43:22 +0000
+++ b/doc/misc/gnus.texi        2011-02-05 00:11:16 +0000
@@ -1,5 +1,7 @@
 \input texinfo
 
address@hidden overrides.texi
+
 @setfilename ../../info/gnus
 @settitle Gnus Manual
 @syncodeindex fn cp
@@ -329,7 +331,12 @@
 
 
 @titlepage
address@hidden WEBHACKDEVEL
address@hidden Gnus Manual (DEVELOPMENT VERSION)
address@hidden ifset
address@hidden WEBHACKDEVEL
 @title Gnus Manual
address@hidden ifclear
 
 @author by Lars Magne Ingebrigtsen
 @page

=== modified file 'doc/misc/message.texi'
--- a/doc/misc/message.texi     2011-01-25 04:08:28 +0000
+++ b/doc/misc/message.texi     2011-02-05 00:11:16 +0000
@@ -1,5 +1,7 @@
 \input texinfo                  @c -*-texinfo-*-
 
address@hidden overrides.texi
+
 @setfilename ../../info/message
 @settitle Message Manual
 @synindex fn cp
@@ -34,7 +36,12 @@
 @end iftex
 
 @titlepage
address@hidden WEBHACKDEVEL
address@hidden Message Manual (DEVELOPMENT VERSION)
address@hidden ifset
address@hidden WEBHACKDEVEL
 @title Message Manual
address@hidden ifclear
 
 @author by Lars Magne Ingebrigtsen
 @page

=== added file 'doc/misc/overrides.texi'
--- a/doc/misc/overrides.texi   1970-01-01 00:00:00 +0000
+++ b/doc/misc/overrides.texi   2011-02-05 00:11:16 +0000
@@ -0,0 +1,1 @@
address@hidden WEBHACKDEVEL

=== modified file 'doc/misc/pgg.texi'
--- a/doc/misc/pgg.texi 2011-01-25 04:08:28 +0000
+++ b/doc/misc/pgg.texi 2011-02-05 00:11:16 +0000
@@ -1,4 +1,7 @@
 \input texinfo                  @c -*-texinfo-*-
+
address@hidden overrides.texi
+
 @setfilename ../../info/pgg
 @settitle PGG @value{VERSION}
 
@@ -30,7 +33,12 @@
 @end direntry
 
 @titlepage
address@hidden WEBHACKDEVEL
address@hidden PGG (DEVELOPMENT VERSION)
address@hidden ifset
address@hidden WEBHACKDEVEL
 @title PGG
address@hidden ifclear
 
 @author by Daiki Ueno
 @page

=== modified file 'doc/misc/sasl.texi'
--- a/doc/misc/sasl.texi        2011-01-25 04:08:28 +0000
+++ b/doc/misc/sasl.texi        2011-02-05 00:11:16 +0000
@@ -1,4 +1,7 @@
 \input texinfo                  @c -*-texinfo-*-
+
address@hidden overrides.texi
+
 @setfilename ../../info/sasl
 
 @set VERSION 0.2
@@ -37,7 +40,12 @@
 
 
 @titlepage
address@hidden WEBHACKDEVEL
address@hidden Emacs SASL Library @value{VERSION} (DEVELOPMENT VERSION)
address@hidden ifset
address@hidden WEBHACKDEVEL
 @title Emacs SASL Library @value{VERSION}
address@hidden ifclear
 
 @author by Daiki Ueno
 @page

=== modified file 'doc/misc/sieve.texi'
--- a/doc/misc/sieve.texi       2011-01-25 04:08:28 +0000
+++ b/doc/misc/sieve.texi       2011-02-05 00:11:16 +0000
@@ -1,4 +1,7 @@
 \input texinfo                  @c -*-texinfo-*-
+
address@hidden overrides.texi
+
 @setfilename ../../info/sieve
 @settitle Emacs Sieve Manual
 @synindex fn cp
@@ -34,7 +37,12 @@
 @setchapternewpage odd
 
 @titlepage
address@hidden WEBHACKDEVEL
address@hidden Emacs Sieve Manual (DEVELOPMENT VERSION)
address@hidden ifset
address@hidden WEBHACKDEVEL
 @title Emacs Sieve Manual
address@hidden ifclear
 
 @author by Simon Josefsson
 @page

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-02-04 09:51:56 +0000
+++ b/lisp/gnus/ChangeLog       2011-02-05 00:11:16 +0000
@@ -1,5 +1,13 @@
 2011-02-04  Lars Ingebrigtsen  <address@hidden>
 
+       * 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

=== modified file 'lisp/gnus/gnus-sum.el'
--- a/lisp/gnus/gnus-sum.el     2011-02-03 23:43:22 +0000
+++ b/lisp/gnus/gnus-sum.el     2011-02-05 00:11:16 +0000
@@ -1395,7 +1395,7 @@
     (?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 @@
 (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\"."

=== modified file 'lisp/gnus/message.el'
--- a/lisp/gnus/message.el      2011-02-04 09:51:56 +0000
+++ b/lisp/gnus/message.el      2011-02-05 00:11:16 +0000
@@ -6411,9 +6411,7 @@
          (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.

=== modified file 'lisp/gnus/shr.el'
--- a/lisp/gnus/shr.el  2011-02-01 03:54:46 +0000
+++ b/lisp/gnus/shr.el  2011-02-05 00:11:16 +0000
@@ -601,7 +601,8 @@
        (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 @@
          (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 @@
                (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)))))))