[nongnu] elpa/j-mode 8116843 30/56: Merge pull request #8 from abo-abo/master

[ELPA Syncer]

branch: elpa/j-mode
commit 811684383609fee2298a5c91a98320d3fb7c21aa
Merge: bbfcd5b 19fe62f
Author: Zachary Elliott <zach@nyu.edu>
Commit: Zachary Elliott <zach@nyu.edu>

    Merge pull request #8 from abo-abo/master
    
    Fix font-lock faces.
---
 j-font-lock.el | 39 +++++++++++++++------------------------
 1 file changed, 15 insertions(+), 24 deletions(-)

diff --git a/j-font-lock.el b/j-font-lock.el
index 55e550f..2be9f43 100644
--- a/j-font-lock.el
+++ b/j-font-lock.el
@@ -57,36 +57,27 @@
   :group 'j
   :group 'j-font-lock)
 
-(defmacro build-faces ( &rest faces )
-  "Allows for easy defining of multiple faces in one command.
-
- (BUILD-FACES (FACE-NAME FACE-RULES DOCS-STR &optional GROUP) ...)"
-  `(eval-when-compile
-     ,@(apply 'nconc (mapcar (lambda ( x )
-                              (let* ((name (car x))
-                                     (body (cdr x)))
-                                `((defvar ,name ',name)
-                                  (defface ,name ,@body))))
-                            faces))))
-
-(build-faces
- (j-verb-face
-  `((t (:foreground "Red")))
+(defvar j-verb-face
+  (defface j-verb-face
+    `((t (:foreground "Red")))
   "Font Lock mode face used to higlight vrebs"
-  :group 'j-faces)
+  :group 'j-faces))
 
- (j-adverb-face
-  `((t (:foreground "Green")))
+(defvar j-adverb-face
+  (defface j-adverb-face
+    `((t (:foreground "Green")))
   "Font Lock mode face used to higlight adverbs"
-  :group 'j-faces)
+  :group 'j-faces))
 
- (j-conjunction-face
-  `((t (:foreground "Blue")))
+(defvar j-conjunction-face
+  (defface j-conjunction-face
+    `((t (:foreground "Blue")))
   "Font Lock mode face used to higlight conjunctions"
-  :group 'j-faces)
+  :group 'j-faces))
 
- (j-other-face
-  `((t (:foreground "Black")))
+(defvar j-other-face
+  (defface j-other-face
+    `((t (:foreground "Black")))
   "Font Lock mode face used to higlight others"
   :group 'j-faces))