diff options
author | Miles Bader <miles@gnu.org> | 2007-07-24 01:23:55 +0000 |
---|---|---|
committer | Miles Bader <miles@gnu.org> | 2007-07-24 01:23:55 +0000 |
commit | 40f9398cdba874aa72fd1828534110caa34702be (patch) | |
tree | ba7af35a2e0a913ccb78095d130ec695e6bfeb97 /lisp/gnus | |
parent | 22110b82771c73e38e4c637b90c5d01da3671c24 (diff) | |
parent | ccb0797a191047816dae47b2e0e7e751027bd0e8 (diff) | |
download | emacs-unicode-xft-base.tar.gz |
Merge from emacs--devo--0unicode-xft-base
Patches applied:
* emacs--devo--0 (patch 816-823)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 59-69)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 237-238)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-235
Diffstat (limited to 'lisp/gnus')
-rw-r--r-- | lisp/gnus/ChangeLog | 9 | ||||
-rw-r--r-- | lisp/gnus/gnus-srvr.el | 10 | ||||
-rw-r--r-- | lisp/gnus/mm-uu.el | 5 |
3 files changed, 18 insertions, 6 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 6a66ebbf756..fa1f2527894 100644 --- 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-14 David Kastrup <dak@gnu.org> * gnus-art.el (gnus-mime-delete-part): Don't go through article-edit 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. |