[nongnu] elpa/moe-theme 49a51d6b83 335/352: moe-theme-flavour-default

[ELPA Syncer]

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

    moe-theme-flavour-default
---
 moe-dark-theme.el     | 55 ++++++++++++++++++++++++++++++++++-----------------
 moe-light-theme.el    | 55 ++++++++++++++++++++++++++++++++++-----------------
 moe-theme-flavours.el |  5 +++--
 3 files changed, 77 insertions(+), 38 deletions(-)

diff --git a/moe-dark-theme.el b/moe-dark-theme.el
index d434dce50e..e945ab89f4 100644
--- a/moe-dark-theme.el
+++ b/moe-dark-theme.el
@@ -33,24 +33,43 @@ Moe, moe, kyun!")
       (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)
+  (defconst -moe-dark-bg                         black-5)
+  (defconst -moe-dark-fg                         white-1)
+  (defconst -moe-dark-builtin                    purple-1)
+  (defconst -moe-dark-comment-delimiter          black-2-5)
+  (defconst -moe-dark-comment                    black-2-5)
+  (defconst -moe-dark-constant                   blue-1)
+  (defconst -moe-dark-doc                        red-0)
+  (defconst -moe-dark-doc-string                 yellow-3)
+  (defconst -moe-dark-function-name              yellow-2)
+  (defconst -moe-dark-keyword                    green-2)
+  (defconst -moe-dark-negation-char              red-0)
+  (defconst -moe-dark-preprocessor               purple-1)
+  (defconst -moe-dark-regexp-grouping-backslash  yellow-1)
+  (defconst -moe-dark-regexp-grouping-construct  purple-1)
+  (defconst -moe-dark-string                     magenta-2)
+  (defconst -moe-dark-type                       cyan-3)
+  (defconst -moe-dark-variable-name              orange-2)
+  (defconst -moe-dark-warning                    red-2)
+
+  (defvar moe-dark-bg                         -moe-dark-bg                     
  )
+  (defvar moe-dark-fg                         -moe-dark-fg                     
  )
+  (defvar moe-dark-builtin                    -moe-dark-builtin                
  )
+  (defvar moe-dark-comment-delimiter          -moe-dark-comment-delimiter      
  )
+  (defvar moe-dark-comment                    -moe-dark-comment                
  )
+  (defvar moe-dark-constant                   -moe-dark-constant               
  )
+  (defvar moe-dark-doc                        -moe-dark-doc                    
  )
+  (defvar moe-dark-doc-string                 -moe-dark-doc-string             
  )
+  (defvar moe-dark-function-name              -moe-dark-function-name          
  )
+  (defvar moe-dark-keyword                    -moe-dark-keyword                
  )
+  (defvar moe-dark-negation-char              -moe-dark-negation-char          
  )
+  (defvar moe-dark-preprocessor               -moe-dark-preprocessor           
  )
+  (defvar moe-dark-regexp-grouping-backslash  
-moe-dark-regexp-grouping-backslash)
+  (defvar moe-dark-regexp-grouping-construct  
-moe-dark-regexp-grouping-construct)
+  (defvar moe-dark-string                     -moe-dark-string                 
  )
+  (defvar moe-dark-type                       -moe-dark-type                   
  )
+  (defvar moe-dark-variable-name              -moe-dark-variable-name          
  )
+  (defvar moe-dark-warning                    -moe-dark-warning                
  )
 
   (custom-theme-set-faces
    'moe-dark
diff --git a/moe-light-theme.el b/moe-light-theme.el
index 3150a698b4..7722454a5f 100644
--- a/moe-light-theme.el
+++ b/moe-light-theme.el
@@ -33,24 +33,43 @@ 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-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)
+  (defconst -moe-light-bg                        LIGHT_BG)
+  (defconst -moe-light-fg                        black-5)
+  (defconst -moe-light-builtin                   purple-2)
+  (defconst -moe-light-comment-delimiter         white-4)
+  (defconst -moe-light-comment                   white-4)
+  (defconst -moe-light-constant                  blue-2)
+  (defconst -moe-light-doc                       red-2)
+  (defconst -moe-light-doc-string                yellow-3)
+  (defconst -moe-light-function-name             red-1)
+  (defconst -moe-light-keyword                   green-3)
+  (defconst -moe-light-negation-char             red-2)
+  (defconst -moe-light-preprocessor              purple-2)
+  (defconst -moe-light-regexp-grouping-backslash orange-2)
+  (defconst -moe-light-regexp-grouping-construct purple-2)
+  (defconst -moe-light-string                    magenta-3)
+  (defconst -moe-light-type                      cyan-5)
+  (defconst -moe-light-variable-name             orange-2)
+  (defconst -moe-light-warning                   red-2)
+
+  (defvar moe-light-bg                        -moe-light-bg                    
   )
+  (defvar moe-light-fg                        -moe-light-fg                    
   )
+  (defvar moe-light-builtin                   -moe-light-builtin               
   )
+  (defvar moe-light-comment-delimiter         -moe-light-comment-delimiter     
   )
+  (defvar moe-light-comment                   -moe-light-comment               
   )
+  (defvar moe-light-constant                  -moe-light-constant              
   )
+  (defvar moe-light-doc                       -moe-light-doc                   
   )
+  (defvar moe-light-doc-string                -moe-light-doc-string            
   )
+  (defvar moe-light-function-name             -moe-light-function-name         
   )
+  (defvar moe-light-keyword                   -moe-light-keyword               
   )
+  (defvar moe-light-negation-char             -moe-light-negation-char         
   )
+  (defvar moe-light-preprocessor              -moe-light-preprocessor          
   )
+  (defvar moe-light-regexp-grouping-backslash 
-moe-light-regexp-grouping-backslash)
+  (defvar moe-light-regexp-grouping-construct 
-moe-light-regexp-grouping-construct)
+  (defvar moe-light-string                    -moe-light-string                
   )
+  (defvar moe-light-type                      -moe-light-type                  
   )
+  (defvar moe-light-variable-name             -moe-light-variable-name         
   )
+  (defvar moe-light-warning                   -moe-light-warning               
   )
 
   (custom-theme-set-faces
    'moe-light
diff --git a/moe-theme-flavours.el b/moe-theme-flavours.el
index e2621022ca..ce338f57f4 100644
--- a/moe-theme-flavours.el
+++ b/moe-theme-flavours.el
@@ -33,8 +33,9 @@
 ;; Default
 ;; ======================================================
 (defun moe-theme-flavour-default ()
-  (mapc (lambda (symbol)
-          (set symbol (default-value symbol)))
+  (interactive)
+  (mapc (lambda (x)
+          (set x (symbol-value (intern (concat "-" (symbol-name x))))))
         '(moe-dark-bg
           moe-dark-fg
           moe-dark-builtin