# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1185240144 0
# Node ID 364c3b96da93e0c5b5d8897a9973fea4e430e359
# Parent  4a6aba4ac8b16a894485ba21c5718d44647af804
Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 237-238)

   - Update from CVS

2007-07-21  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus/mm-uu.el (mm-uu-type-alist): Refer to mm-uu-configure-list in doc
   string.

2007-07-16  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/gnus-srvr.el (gnus-server-font-lock-keywords): Quote faces.

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

diff -r 4a6aba4ac8b1 -r 364c3b96da93 lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Tue Jul 24 01:06:39 2007 +0000
+++ b/lisp/gnus/ChangeLog	Tue Jul 24 01:22:24 2007 +0000
@@ -1,3 +1,12 @@
+2007-07-21  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* mm-uu.el (mm-uu-type-alist): Refer to mm-uu-configure-list in doc
+	string.
+
+2007-07-16  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus-srvr.el (gnus-server-font-lock-keywords): Quote faces.
+
 2007-07-13  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* gnus-srvr.el (gnus-server-agent-face, gnus-server-opened-face)
diff -r 4a6aba4ac8b1 -r 364c3b96da93 lisp/gnus/gnus-srvr.el
--- a/lisp/gnus/gnus-srvr.el	Tue Jul 24 01:06:39 2007 +0000
+++ b/lisp/gnus/gnus-srvr.el	Tue Jul 24 01:22:24 2007 +0000
@@ -215,11 +215,11 @@
 (put 'gnus-server-offline-face 'face-alias 'gnus-server-offline)
 
 (defvar gnus-server-font-lock-keywords
-  '(("(\\(agent\\))" 1 gnus-server-agent)
-    ("(\\(opened\\))" 1 gnus-server-opened)
-    ("(\\(closed\\))" 1 gnus-server-closed)
-    ("(\\(offline\\))" 1 gnus-server-offline)
-    ("(\\(denied\\))" 1 gnus-server-denied)))
+  '(("(\\(agent\\))" 1 'gnus-server-agent)
+    ("(\\(opened\\))" 1 'gnus-server-opened)
+    ("(\\(closed\\))" 1 'gnus-server-closed)
+    ("(\\(offline\\))" 1 'gnus-server-offline)
+    ("(\\(denied\\))" 1 'gnus-server-denied)))
 
 (defun gnus-server-mode ()
   "Major mode for listing and editing servers.
diff -r 4a6aba4ac8b1 -r 364c3b96da93 lisp/gnus/mm-uu.el
--- a/lisp/gnus/mm-uu.el	Tue Jul 24 01:06:39 2007 +0000
+++ b/lisp/gnus/mm-uu.el	Tue Jul 24 01:22:24 2007 +0000
@@ -162,7 +162,10 @@
 Each element consist of the following entries: label,
 start-regexp, end-regexp, extract-function, test-function.
 
-After modifying this list you must run \\[mm-uu-configure].")
+After modifying this list you must run \\[mm-uu-configure].
+
+You can disable elements from this list by customizing
+`mm-uu-configure-list'.")
 
 (defcustom mm-uu-configure-list '((shar . disabled))
   "A list of mm-uu configuration.