summaryrefslogtreecommitdiff
path: root/lisp/gnus/gnus-spec.el
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen <larsi@gnus.org>2011-09-04 22:17:09 +0000
committerKatsumi Yamaoka <yamaoka@jpl.org>2011-09-04 22:17:09 +0000
commit052bd38a56ad14a7f311677051e778de6c4bdc1c (patch)
tree9665d674fcb17743e603175e33986a81c2d30309 /lisp/gnus/gnus-spec.el
parent86633eab8a77697f6e15aae568868781a5a1023f (diff)
downloademacs-052bd38a56ad14a7f311677051e778de6c4bdc1c.tar.gz
Merge changes made in Gnus trunk.
gnus.el (gnus-home-directory): Add warning about setting in .gnus.el (bug#9405). gnus-score.el (gnus-summary-increase-score): Doc clarification (bug#9421). gnus-spec.el (gnus-face-0): Make all the face specs into defcustoms (bug#9425). gnus-art.el (gnus-treatment-function-alist): Remove CRs as the first thing (bug#9426).
Diffstat (limited to 'lisp/gnus/gnus-spec.el')
-rw-r--r--lisp/gnus/gnus-spec.el58
1 files changed, 48 insertions, 10 deletions
diff --git a/lisp/gnus/gnus-spec.el b/lisp/gnus/gnus-spec.el
index 0fa64a84b75..31cb9864ff2 100644
--- a/lisp/gnus/gnus-spec.el
+++ b/lisp/gnus/gnus-spec.el
@@ -264,11 +264,30 @@ Return a list of updated types."
(push (cons 'version emacs-version) gnus-format-specs))
updated))
-(defvar gnus-mouse-face-0 'highlight)
-(defvar gnus-mouse-face-1 'highlight)
-(defvar gnus-mouse-face-2 'highlight)
-(defvar gnus-mouse-face-3 'highlight)
-(defvar gnus-mouse-face-4 'highlight)
+(defcustom gnus-mouse-face-0 'highlight
+ "The \"%(hello%)\" face."
+ :group 'gnus-format
+ :type 'face)
+
+(defcustom gnus-mouse-face-1 'highlight
+ "The \"%1(hello%)\" face."
+ :group 'gnus-format
+ :type 'face)
+
+(defcustom gnus-mouse-face-2 'highlight
+ "The \"%2(hello%)\" face."
+ :group 'gnus-format
+ :type 'face)
+
+(defcustom gnus-mouse-face-3 'highlight
+ "The \"%3(hello%)\" face."
+ :group 'gnus-format
+ :type 'face)
+
+(defcustom gnus-mouse-face-4 'highlight
+ "The \"%4(hello%)\" face."
+ :group 'gnus-format
+ :type 'face)
(defun gnus-mouse-face-function (form type)
`(gnus-put-text-property
@@ -278,11 +297,30 @@ Return a list of updated types."
'gnus-mouse-face
`(quote ,(symbol-value (intern (format "gnus-mouse-face-%d" type)))))))
-(defvar gnus-face-0 'bold)
-(defvar gnus-face-1 'italic)
-(defvar gnus-face-2 'bold-italic)
-(defvar gnus-face-3 'bold)
-(defvar gnus-face-4 'bold)
+(defcustom gnus-face-0 'bold
+ "The \"%{hello%}\" face."
+ :group 'gnus-format
+ :type 'face)
+
+(defcustom gnus-face-1 'italic
+ "The \"%1{hello%}\" face."
+ :group 'gnus-format
+ :type 'face)
+
+(defcustom gnus-face-2 'bold-italic
+ "The \"%2{hello%}\" face."
+ :group 'gnus-format
+ :type 'face)
+
+(defcustom gnus-face-3 'bold
+ "The \"%3{hello%}\" face."
+ :group 'gnus-format
+ :type 'face)
+
+(defcustom gnus-face-4 'bold
+ "The \"%4{hello%}\" face."
+ :group 'gnus-format
+ :type 'face)
(defun gnus-face-face-function (form type)
`(gnus-add-text-properties