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.

9 files changed, 79 insertions, 0 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index dd7be139b69..56195a907e8 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,28 @@
+2011-02-04  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * 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  <larsi@gnus.org>
+
+        * gnus.texi: Add DEVEL header (suggested by Andreas Schwab).
+
 2011-02-03  Paul Eggert  <eggert@cs.ucla.edu>
 
         * texinfo.tex: Update to version 2011-02-01.10 from gnulib,
diff --git a/doc/misc/auth.texi b/doc/misc/auth.texi
index f19d6e28ddb..a89018dd00e 100644
--- a/doc/misc/auth.texi
+++ b/doc/misc/auth.texi
@@ -1,4 +1,7 @@
 \input texinfo                  @c -*-texinfo-*-
+
+@include overrides.texi
+
 @setfilename ../../info/auth
 @settitle Emacs auth-source Library @value{VERSION}
 
@@ -35,7 +38,12 @@ license to the document, as described in section 6 of the license.
 @end direntry
 
 @titlepage
+@ifset WEBHACKDEVEL
+@title Emacs auth-source Library (DEVELOPMENT VERSION)
+@end ifset
+@ifclear WEBHACKDEVEL
 @title Emacs auth-source Library
+@end ifclear
 @author by Ted Zlatanov
 @page
 @vskip 0pt plus 1filll
diff --git a/doc/misc/emacs-mime.texi b/doc/misc/emacs-mime.texi
index 62a43aa11bc..0acb3187157 100644
--- a/doc/misc/emacs-mime.texi
+++ b/doc/misc/emacs-mime.texi
@@ -1,5 +1,7 @@
 \input texinfo
 
+@include overrides.texi
+
 @setfilename ../../info/emacs-mime
 @settitle Emacs MIME Manual
 @synindex fn cp
@@ -38,7 +40,12 @@ developing GNU and promoting software freedom.''
 @setchapternewpage odd
 
 @titlepage
+@ifset WEBHACKDEVEL
+@title Emacs MIME Manual (DEVELOPMENT VERSION)
+@end ifset
+@ifclear WEBHACKDEVEL
 @title Emacs MIME Manual
+@end ifclear
 
 @author by Lars Magne Ingebrigtsen
 @page
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 936f140af00..83a689fcbc0 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -1,5 +1,7 @@
 \input texinfo
 
+@include overrides.texi
+
 @setfilename ../../info/gnus
 @settitle Gnus Manual
 @syncodeindex fn cp
@@ -329,7 +331,12 @@ developing GNU and promoting software freedom.''
 
 
 @titlepage
+@ifset WEBHACKDEVEL
+@title Gnus Manual (DEVELOPMENT VERSION)
+@end ifset
+@ifclear WEBHACKDEVEL
 @title Gnus Manual
+@end ifclear
 
 @author by Lars Magne Ingebrigtsen
 @page
diff --git a/doc/misc/message.texi b/doc/misc/message.texi
index 34bd14f2a82..7a7315d0fa5 100644
--- a/doc/misc/message.texi
+++ b/doc/misc/message.texi
@@ -1,5 +1,7 @@
 \input texinfo                  @c -*-texinfo-*-
 
+@include overrides.texi
+
 @setfilename ../../info/message
 @settitle Message Manual
 @synindex fn cp
@@ -34,7 +36,12 @@ developing GNU and promoting software freedom.''
 @end iftex
 
 @titlepage
+@ifset WEBHACKDEVEL
+@title Message Manual (DEVELOPMENT VERSION)
+@end ifset
+@ifclear WEBHACKDEVEL
 @title Message Manual
+@end ifclear
 
 @author by Lars Magne Ingebrigtsen
 @page
diff --git a/doc/misc/overrides.texi b/doc/misc/overrides.texi
new file mode 100644
index 00000000000..369462b775d
--- /dev/null
+++ b/doc/misc/overrides.texi
@@ -0,0 +1 @@
+@clear WEBHACKDEVEL
diff --git a/doc/misc/pgg.texi b/doc/misc/pgg.texi
index 9bdb1eaa216..3ca26af7b0d 100644
--- a/doc/misc/pgg.texi
+++ b/doc/misc/pgg.texi
@@ -1,4 +1,7 @@
 \input texinfo                  @c -*-texinfo-*-
+
+@include overrides.texi
+
 @setfilename ../../info/pgg
 @settitle PGG @value{VERSION}
 
@@ -30,7 +33,12 @@ developing GNU and promoting software freedom.''
 @end direntry
 
 @titlepage
+@ifset WEBHACKDEVEL
+@title PGG (DEVELOPMENT VERSION)
+@end ifset
+@ifclear WEBHACKDEVEL
 @title PGG
+@end ifclear
 
 @author by Daiki Ueno
 @page
diff --git a/doc/misc/sasl.texi b/doc/misc/sasl.texi
index 99c4c98e439..d87b5acaf44 100644
--- a/doc/misc/sasl.texi
+++ b/doc/misc/sasl.texi
@@ -1,4 +1,7 @@
 \input texinfo                  @c -*-texinfo-*-
+
+@include overrides.texi
+
 @setfilename ../../info/sasl
 
 @set VERSION 0.2
@@ -37,7 +40,12 @@ license to the document, as described in section 6 of the license.
 
 
 @titlepage
+@ifset WEBHACKDEVEL
+@title Emacs SASL Library @value{VERSION} (DEVELOPMENT VERSION)
+@end ifset
+@ifclear WEBHACKDEVEL
 @title Emacs SASL Library @value{VERSION}
+@end ifclear
 
 @author by Daiki Ueno
 @page
diff --git a/doc/misc/sieve.texi b/doc/misc/sieve.texi
index 5c069f619ff..52677b57fbe 100644
--- a/doc/misc/sieve.texi
+++ b/doc/misc/sieve.texi
@@ -1,4 +1,7 @@
 \input texinfo                  @c -*-texinfo-*-
+
+@include overrides.texi
+
 @setfilename ../../info/sieve
 @settitle Emacs Sieve Manual
 @synindex fn cp
@@ -34,7 +37,12 @@ developing GNU and promoting software freedom.''
 @setchapternewpage odd
 
 @titlepage
+@ifset WEBHACKDEVEL
+@title Emacs Sieve Manual (DEVELOPMENT VERSION)
+@end ifset
+@ifclear WEBHACKDEVEL
 @title Emacs Sieve Manual
+@end ifclear
 
 @author by Simon Josefsson
 @page