Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 269)

   - Update from CVS

2007-11-03  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus/gnus-sum.el (gnus-summary-highlight): Mark as risky local variable.

2007-11-04  Reiner Steib  <Reiner.Steib@gmx.de>

   * man/gnus.texi, man/gnus-faq.texi, man/message.texi: Bump version to 5.10.9.

Revision: emacs@sv.gnu.org/emacs--rel--22--patch-147

4 files changed, 10 insertions, 1 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 5df07f75355..728ef10c747 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-03  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * gnus-sum.el (gnus-summary-highlight): Mark as risky local variable.
+
 2007-11-01  Reiner Steib  <Reiner.Steib@gmx.de>
 
         * mm-util.el (mm-charset-eval-alist): Mark as risky local variable.
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 8fb18d3a990..96f7ea11c5d 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -990,6 +990,7 @@ uncached:     Non-nil if the article is uncached."
   :group 'gnus-summary-visual
   :type '(repeat (cons (sexp :tag "Form" nil)
                        face)))
+(put 'gnus-summary-highlight 'risky-local-variable t)
 
 (defcustom gnus-alter-header-function nil
   "Function called to allow alteration of article header structures.
diff --git a/man/ChangeLog b/man/ChangeLog
index c70b92ac099..b3151b56e05 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-04  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * gnus.texi, gnus-faq.texi, message.texi: Bump version to 5.10.9.
+
 2007-11-02  Nick Roberts  <nickrob@snap.net.nz>
 
         * building.texi (Watch Expressions): Remove obscure sentence.
diff --git a/man/gnus-faq.texi b/man/gnus-faq.texi
index 3aee3f25113..2415a7fa01e 100644
--- a/man/gnus-faq.texi
+++ b/man/gnus-faq.texi
@@ -128,7 +128,7 @@ What is the latest version of Gnus?
 Jingle please: Gnus 5.10 is released, get it while it's
 hot! As well as the step in version number is rather
 small, Gnus 5.10 has tons of new features which you
-shouldn't miss. The current release (5.10.8) should be at
+shouldn't miss. The current release (5.10.9) should be at
 least as stable as the latest release of the 5.8 series.
 
 @node [1.2]