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 --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 5e45df2e902f85a0a98f2484e13b37d836cf572a..6fd7a1056df6d0071a6cd0440b0baa0a73907169 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -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 --git a/lisp/gnus/gnus-srvr.el b/lisp/gnus/gnus-srvr.el
index 0d5443f576c6b3beb728e4fbe80142d96e21eb0b..21c9974980410b06e23bde4ea09f234a5f0d6a54 100644 (file)
--- a/lisp/gnus/gnus-srvr.el
+++ b/lisp/gnus/gnus-srvr.el
@@ -215,11 +215,11 @@ If nil, a faster, but more primitive, buffer is used instead."
 (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 --git a/lisp/gnus/mm-uu.el b/lisp/gnus/mm-uu.el
index 26eae64777f5e4d35e4e108e1e5151c413f5e15a..acd39c8dfa124675d316e9d7c6be7ab658c67a06 100644 (file)
--- a/lisp/gnus/mm-uu.el
+++ b/lisp/gnus/mm-uu.el
@@ -162,7 +162,10 @@ This can be either \"inline\" or \"attachment\".")
 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.