From f931ce84da6a9515dc99f88beb0de3a4138cc1cd Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Tue, 24 Jul 2007 01:22:24 +0000 Subject: [PATCH] Merge from gnus--rel--5.10 Patches applied: * gnus--rel--5.10 (patch 237-238) - Update from CVS 2007-07-21 Reiner Steib * lisp/gnus/mm-uu.el (mm-uu-type-alist): Refer to mm-uu-configure-list in doc string. 2007-07-16 Katsumi Yamaoka * lisp/gnus/gnus-srvr.el (gnus-server-font-lock-keywords): Quote faces. Revision: emacs@sv.gnu.org/emacs--rel--22--patch-69 --- lisp/gnus/ChangeLog | 9 +++++++++ lisp/gnus/gnus-srvr.el | 10 +++++----- lisp/gnus/mm-uu.el | 5 ++++- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 5e45df2e902..6fd7a1056df 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,12 @@ +2007-07-21 Reiner Steib + + * mm-uu.el (mm-uu-type-alist): Refer to mm-uu-configure-list in doc + string. + +2007-07-16 Katsumi Yamaoka + + * gnus-srvr.el (gnus-server-font-lock-keywords): Quote faces. + 2007-07-13 Katsumi Yamaoka * 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 0d5443f576c..21c99749804 100644 --- 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 26eae64777f..acd39c8dfa1 100644 --- 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. -- 2.39.5