X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=epa.el;h=18614aff1f0af9b7795166187f5564a4457c26eb;hb=ed9fc0d26f8848cebd5c76c8a6b609f219a04fea;hp=6a6b422a3e3f141fc08af61fae6176c0dfdbe2a8;hpb=1b02fba040aa7dcece32f707431c9ed64cd614ba;p=elisp%2Fepg.git

diff --git a/epa.el b/epa.el
index 6a6b422..18614af 100644
--- a/epa.el
+++ b/epa.el
@@ -48,39 +48,39 @@ the separate window."
   "Faces for epa-mode."
   :group 'epa)
 
-(defface epa-validity-high-face
+(defface epa-validity-high
   '((((class color) (background dark))
      (:foreground "PaleTurquoise" :bold t))
     (t
      (:bold t)))
   "Face used for displaying the high validity."
   :group 'epa-faces)
-(defvar epa-validity-high-face 'epa-validity-high-face)
+(defvar epa-validity-high 'epa-validity-high)
 
-(defface epa-validity-medium-face
+(defface epa-validity-medium
   '((((class color) (background dark))
      (:foreground "PaleTurquoise" :italic t))
     (t
      ()))
   "Face used for displaying the medium validity."
   :group 'epa-faces)
-(defvar epa-validity-medium-face 'epa-validity-medium-face)
+(defvar epa-validity-medium 'epa-validity-medium)
 
-(defface epa-validity-low-face
+(defface epa-validity-low
   '((t
      (:italic t)))
   "Face used for displaying the low validity."
   :group 'epa-faces)
-(defvar epa-validity-low-face 'epa-validity-low-face)
+(defvar epa-validity-low 'epa-validity-low)
 
-(defface epa-validity-disabled-face
+(defface epa-validity-disabled
   '((t
      (:italic t :inverse-video t)))
   "Face used for displaying the disabled validity."
   :group 'epa-faces)
-(defvar epa-validity-disabled-face 'epa-validity-disabled-face)
+(defvar epa-validity-disabled 'epa-validity-disabled)
 
-(defface epa-string-face
+(defface epa-string
   '((((class color)
       (background dark))
      (:foreground "lightyellow"))
@@ -91,55 +91,55 @@ the separate window."
      ()))
   "Face used for displaying the string."
   :group 'epa-faces)
-(defvar epa-string-face 'epa-string-face)
+(defvar epa-string 'epa-string)
 
-(defface epa-mark-face
+(defface epa-mark
   '((((class color) (background dark))
      (:foreground "orange" :bold t))
     (t
      (:foreground "red" :bold t)))
   "Face used for displaying the high validity."
   :group 'epa-faces)
-(defvar epa-mark-face 'epa-mark-face)
+(defvar epa-mark 'epa-mark)
 
-(defface epa-field-name-face
+(defface epa-field-name
   '((((class color) (background dark))
      (:foreground "PaleTurquoise" :bold t))
     (t (:bold t)))
   "Face for the name of the attribute field."
   :group 'epa)
-(defvar epa-field-name-face 'epa-field-name-face)
+(defvar epa-field-name 'epa-field-name)
 
-(defface epa-field-body-face
+(defface epa-field-body
   '((((class color) (background dark))
      (:foreground "turquoise" :italic t))
     (t (:italic t)))
   "Face for the body of the attribute field."
   :group 'epa)
-(defvar epa-field-body-face 'epa-field-body-face)
+(defvar epa-field-body 'epa-field-body)
 
 (defcustom epa-validity-face-alist
-  '((unknown . epa-validity-disabled-face)
-    (invalid . epa-validity-disabled-face)
-    (disabled . epa-validity-disabled-face)
-    (revoked . epa-validity-disabled-face)
-    (expired . epa-validity-disabled-face)
-    (none . epa-validity-low-face)
-    (undefined . epa-validity-low-face)
-    (never . epa-validity-low-face)
-    (marginal . epa-validity-medium-face)
-    (full . epa-validity-high-face)
-    (ultimate . epa-validity-high-face))
+  '((unknown . epa-validity-disabled)
+    (invalid . epa-validity-disabled)
+    (disabled . epa-validity-disabled)
+    (revoked . epa-validity-disabled)
+    (expired . epa-validity-disabled)
+    (none . epa-validity-low)
+    (undefined . epa-validity-low)
+    (never . epa-validity-low)
+    (marginal . epa-validity-medium)
+    (full . epa-validity-high)
+    (ultimate . epa-validity-high))
   "An alist mapping validity values to faces."
   :type 'list
   :group 'epa)
 
 (defcustom epa-font-lock-keywords
   '(("^\\*"
-     (0 epa-mark-face))
+     (0 'epa-mark))
     ("^\t\\([^\t:]+:\\)[ \t]*\\(.*\\)$"
-     (1 epa-field-name-face)
-     (2 epa-field-body-face)))
+     (1 'epa-field-name)
+     (2 'epa-field-body)))
   "Default expressions to addon in epa-mode."
   :type '(repeat (list string))
   :group 'epa)