[nongnu] elpa/moe-theme 2634eb6d92 319/352: customizable font-lock color

[ELPA Syncer]

branch: elpa/moe-theme
commit 2634eb6d92eab75cdb6325400bb51514b7bfc3d7
Author: onohiroko <azazabc123@gmail.com>
Commit: onohiroko <azazabc123@gmail.com>

    customizable font-lock color
---
 moe-dark-theme.el  | 70 +++++++++++++++++++++++++++++++-----------------------
 moe-light-theme.el | 37 +++++++++++++----------------
 2 files changed, 57 insertions(+), 50 deletions(-)

diff --git a/moe-dark-theme.el b/moe-dark-theme.el
index 94186c02cd..42e0d906d1 100644
--- a/moe-dark-theme.el
+++ b/moe-dark-theme.el
@@ -32,17 +32,49 @@ Moe, moe, kyun!")
       (orange-0 "#ffaf87") (orange-00 "#ffd787") (orange-000 "#ffd7af")
       (linum-dark "#87875f") (linum-light "#d7d7af")
       )
-
+  ;; Customize color
+  (defvar moe-dark-bg                         black-5)
+  (defvar moe-dark-fg                         white-1)
+  (defvar moe-dark-builtin                    purple-1)
+  (defvar moe-dark-comment-delimiter          black-2-5)
+  (defvar moe-dark-comment                    black-2-5)
+  (defvar moe-dark-constant                   blue-1)
+  (defvar moe-dark-doc                        red-0)
+  (defvar moe-dark-doc-string                 yellow-3)
+  (defvar moe-dark-function-name              yellow-2)
+  (defvar moe-dark-keyword                    green-2)
+  (defvar moe-dark-negation-char              red-0)
+  (defvar moe-dark-preprocessor               purple-1)
+  (defvar moe-dark-regexp-grouping-backslash  yellow-1)
+  (defvar moe-dark-regexp-grouping-construct  purple-1)
+  (defvar moe-dark-string                     magenta-2)
+  (defvar moe-dark-type                       cyan-3)
+  (defvar moe-dark-variable-name              orange-2)
+  (defvar moe-dark-warning                    red-2)
 
   (custom-theme-set-faces
    'moe-dark
+   ;; Font lock faces
+   `(font-lock-builtin-face              ((,class (:foreground 
,moe-dark-builtin                  ))))
+   `(font-lock-comment-delimiter-face    ((,class (:foreground 
,moe-dark-comment-delimiter        :slant italic))))
+   `(font-lock-comment-face              ((,class (:foreground 
,moe-dark-comment                  :slant italic))))
+   `(font-lock-constant-face             ((,class (:foreground 
,moe-dark-constant                 ))))
+   `(font-lock-doc-face                  ((,class (:foreground ,moe-dark-doc   
                   ))))
+   `(font-lock-doc-string-face           ((,class (:foreground 
,moe-dark-doc-string               ))))
+   `(font-lock-function-name-face        ((,class (:foreground 
,moe-dark-function-name            ))))
+   `(font-lock-keyword-face              ((,class (:foreground 
,moe-dark-keyword                  ))))
+   `(font-lock-negation-char-face        ((,class (:foreground 
,moe-dark-negation-char            ))))
+   `(font-lock-preprocessor-face         ((,class (:foreground 
,moe-dark-preprocessor             ))))
+   `(font-lock-regexp-grouping-backslash ((,class (:foreground 
,moe-dark-regexp-grouping-backslash))))
+   `(font-lock-regexp-grouping-construct ((,class (:foreground 
,moe-dark-regexp-grouping-construct))))
+   `(font-lock-string-face               ((,class (:foreground 
,moe-dark-string                   ))))
+   `(font-lock-type-face                 ((,class (:foreground ,moe-dark-type  
                   ))))
+   `(font-lock-variable-name-face        ((,class (:foreground 
,moe-dark-variable-name            ))))
+   `(font-lock-warning-face              ((,class (:foreground 
,moe-dark-warning               :weight bold ))))
    ;; Ensure sufficient contrast on low-color terminals.
-   `(default ((((class color) (min-colors 4096))
-              (:foreground ,white-1 :background ,black-5))
-             (((class color) (min-colors 256))
-              (:foreground ,white-1 :background ,black-5))
-             (,class
-              (:foreground ,white-1 :background ,black-5))))
+   `(default ((((class color) (min-colors 4096)) (:foreground ,white-1 
:background ,black-5))
+             (((class color) (min-colors 256)) (:foreground ,white-1 
:background ,black-5))
+             (,class (:foreground ,white-1 :background ,black-5))))
    `(cursor ((,class (:background ,white-0))))
 
    ;; Highlighting faces
@@ -74,24 +106,6 @@ Moe, moe, kyun!")
    `(warning ((,class (:foreground ,orange-1))))
    `(success ((,class (:foreground ,green-1))))
 
-   ;; Font lock faces
-   `(font-lock-builtin-face ((,class (:foreground ,purple-1))))
-   `(font-lock-comment-delimiter-face ((,class (:foreground ,black-2-5 :slant 
italic))))
-   `(font-lock-comment-face ((,class (:foreground ,black-2-5 :slant italic))))
-   `(font-lock-constant-face ((,class (:foreground ,blue-1))))
-   `(font-lock-doc-face ((,class (:foreground ,red-0))))
-   `(font-lock-doc-string-face ((,class (:foreground ,yellow-3))))
-   `(font-lock-function-name-face ((,class (:foreground ,yellow-2))))
-   `(font-lock-keyword-face ((,class (:foreground ,green-2))))
-   `(font-lock-negation-char-face ((,class (:foreground ,red-0))))
-   `(font-lock-preprocessor-face ((,class (:foreground ,purple-1))))
-   `(font-lock-regexp-grouping-backslash ((,class (:foreground ,yellow-1))))
-   `(font-lock-regexp-grouping-construct ((,class (:foreground ,purple-1))))
-   `(font-lock-string-face ((,class (:foreground ,magenta-2))))
-   `(font-lock-type-face ((,class (:foreground ,cyan-3))))
-   `(font-lock-variable-name-face ((,class (:foreground ,orange-2))))
-   `(font-lock-warning-face ((,class (:weight bold :foreground ,red-2))))
-
    ;; Completions
    `(completions-annotations ((,class (:foreground ,green-2))))
    `(completions-common-part ((,class (:foreground ,black-2-5))))
@@ -944,11 +958,7 @@ Moe, moe, kyun!")
 
   (custom-theme-set-variables
    'moe-dark
-   `(ansi-color-names-vector [,black-5 ,red-0 ,green-0 ,yellow-1
-                                       ,blue-1 ,purple-1 ,blue-0 ,white-1])))
-
-
-(setq moe-theme-which-enabled 'dark)
+   `(ansi-color-names-vector [,black-5 ,red-0 ,green-0 ,yellow-1 ,blue-1 
,purple-1 ,blue-0 ,white-1])))
 
 (provide-theme 'moe-dark)
 
diff --git a/moe-light-theme.el b/moe-light-theme.el
index 3bd66ccbc1..ed1af61ea2 100644
--- a/moe-light-theme.el
+++ b/moe-light-theme.el
@@ -33,24 +33,24 @@ Moe, moe, kyun!")
       (linum-dark "#87875f") (linum-light "#d7d7af")
       )
   ;; Customize color
-  (defvar moe-light-bg LIGHT_BG)
-  (defvar moe-light-fg black-5)
-  (defvar moe-light-builtin purple-2)
-  (defvar moe-light-comment-delimiter white-4)
-  (defvar moe-light-comment white-4)
-  (defvar moe-light-constant blue-2)
-  (defvar moe-light-doc red-2)
-  (defvar moe-light-doc-string yellow-3)
-  (defvar moe-light-function-name red-1)
-  (defvar moe-light-keyword green-3)
-  (defvar moe-light-negation-char red-2)
-  (defvar moe-light-preprocessor purple-2)
+  (defvar moe-light-bg                        LIGHT_BG)
+  (defvar moe-light-fg                        black-5)
+  (defvar moe-light-builtin                   purple-2)
+  (defvar moe-light-comment-delimiter         white-4)
+  (defvar moe-light-comment                   white-4)
+  (defvar moe-light-constant                  blue-2)
+  (defvar moe-light-doc                       red-2)
+  (defvar moe-light-doc-string                yellow-3)
+  (defvar moe-light-function-name             red-1)
+  (defvar moe-light-keyword                   green-3)
+  (defvar moe-light-negation-char             red-2)
+  (defvar moe-light-preprocessor              purple-2)
   (defvar moe-light-regexp-grouping-backslash orange-2)
   (defvar moe-light-regexp-grouping-construct purple-2)
-  (defvar moe-light-string magenta-3)
-  (defvar moe-light-type cyan-5)
-  (defvar moe-light-variable-name orange-2)
-  (defvar moe-light-warning red-2)
+  (defvar moe-light-string                    magenta-3)
+  (defvar moe-light-type                      cyan-5)
+  (defvar moe-light-variable-name             orange-2)
+  (defvar moe-light-warning                   red-2)
 
   (custom-theme-set-faces
    'moe-light
@@ -70,7 +70,7 @@ Moe, moe, kyun!")
    `(font-lock-string-face               ((,class (:foreground 
,moe-light-string                   ))))
    `(font-lock-type-face                 ((,class (:foreground ,moe-light-type 
                    ))))
    `(font-lock-variable-name-face        ((,class (:foreground 
,moe-light-variable-name            ))))
-   `(font-lock-warning-face              ((,class (:foreground 
,moe-light-warning               :weight bold ))))
+   `(font-lock-warning-face              ((,class (:foreground 
,moe-light-warning               :weight bold))))
    ;; Ensure sufficient contrast on low-color terminals.
    `(default ((((class color) (min-colors 4096)) (:foreground ,moe-light-fg 
:background ,moe-light-bg))
               (((class color) (min-colors 256)) (:foreground ,moe-light-fg 
:background ,moe-light-bg))
@@ -966,9 +966,6 @@ Moe, moe, kyun!")
    'moe-light
    `(ansi-color-names-vector [,black-5 ,red-0 ,green-2 ,yellow-1 ,blue-1 
,purple-1 ,blue-0 ,white-0])))
 
-
-(setq moe-theme-which-enabled 'light)
-
 (provide-theme 'moe-light)
 
 ;; Local Variables: