solarized-emacs

commit a9483844f5118722af2d603a726a0fa973a4a310
parent 4b194573b14867a7c68c55cad25480de4374a855
Author: Bozhidar Batsov <bozhidar.batsov@gmail.com>
Date:   Mon, 23 Apr 2012 07:29:04 -0700

Merge pull request #26 from thomasf/childtheme

Child theme
Diffstat:
M
solarized-dark-theme.el
 | 
2
+-
M
solarized-light-theme.el
 | 
2
+-
M
solarized-theme.el
 | 
11
+++++++----

3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/solarized-dark-theme.el b/solarized-dark-theme.el
@@ -2,6 +2,6 @@
 
 (deftheme solarized-dark "The dark variant of the Solarized colour theme")
 
-(create-solarized-theme 'dark)
+(create-solarized-theme 'dark 'solarized-dark)
 
 (provide-theme 'solarized-dark)
diff --git a/solarized-light-theme.el b/solarized-light-theme.el
@@ -2,6 +2,6 @@
 
 (deftheme solarized-light "The light variant of the Solarized colour theme")
 
-(create-solarized-theme 'light)
+(create-solarized-theme 'light 'solarized-light)
 
 (provide-theme 'solarized-light)
diff --git a/solarized-theme.el b/solarized-theme.el
@@ -42,7 +42,7 @@
 ;;
 ;;; Code
 
-(defun create-solarized-theme (variant)
+(defun create-solarized-theme (variant theme-name &optional childtheme)
   (let* ((class '((class color) (min-colors 89)))
          ;; Solarized palette
          (base03    "#002b36")
@@ -114,7 +114,7 @@
          (green-hc (if (eq variant 'light) green-d green-l))
          (green-lc (if (eq variant 'light) green-l green-d)))
     (custom-theme-set-faces
-     (if (eq variant 'light) 'solarized-light 'solarized-dark)
+     theme-name
      '(button ((t (:underline t))))
      `(link ((,class (:foreground ,yellow :underline t :weight bold))))
      `(link-visited ((,class (:foreground ,yellow :underline t :weight normal))))
@@ -534,12 +534,15 @@
 
 
     (custom-theme-set-variables
-     (if (eq variant 'light) 'solarized-light 'solarized-dark)
+     theme-name
      '(ansi-color-names-vector [solarized-bg red green yellow
                                              blue magenta cyan solarized-fg])
 
      ;; fill-column-indicator
-     `(fci-rule-color ,solarized-hl))))
+     `(fci-rule-color ,solarized-hl))
+
+    ;; call chained theme function
+    (when childtheme (funcall childtheme))))
 
 ;;;###autoload
 (when load-file-name