From e7b9997d34102fe5584cb2a6884417fe18569e8a Mon Sep 17 00:00:00 2001 From: Greg Pfeil Date: Tue, 6 Jan 2015 19:43:18 -0700 Subject: [PATCH] Deprecate the old dark/light themes. There is now a single theme that will use light or dark versions based on the background-mode of the frame, this allows a mix of light and dark frames. --- color-theme-solarized.el | 13 +++++++++++++ solarized-dark-theme.el | 11 +++++++++++ solarized-definitions.el | 7 +++++++ solarized-light-theme.el | 11 +++++++++++ solarized-theme.el | 11 ++--------- 5 files changed, 44 insertions(+), 9 deletions(-) create mode 100644 solarized-dark-theme.el create mode 100644 solarized-light-theme.el diff --git a/color-theme-solarized.el b/color-theme-solarized.el index ea79968..bdbbc16 100644 --- a/color-theme-solarized.el +++ b/color-theme-solarized.el @@ -35,4 +35,17 @@ Ported to Emacs by Greg Pfeil, http://ethanschoonover.com/solarized." "Solarized" ,solarized-description)) +;;;###autoload +(defun color-theme-solarized-dark () + "Color theme by Ethan Schoonover, created 2011-03-24. +Ported to Emacs by Greg Pfeil, http://ethanschoonover.com/solarized." + (declare (obsolete color-theme-solarized "2013-05-01")) + (color-theme-solarized)) +;;;###autoload +(defun color-theme-solarized-light () + "Color theme by Ethan Schoonover, created 2011-03-24. +Ported to Emacs by Greg Pfeil, http://ethanschoonover.com/solarized." + (declare (obsolete color-theme-solarized "2013-05-01")) + (color-theme-solarized)) + (provide 'color-theme-solarized) diff --git a/solarized-dark-theme.el b/solarized-dark-theme.el new file mode 100644 index 0000000..b7b9cf0 --- /dev/null +++ b/solarized-dark-theme.el @@ -0,0 +1,11 @@ +(require 'solarized-definitions + (locate-file "solarized-definitions.el" custom-theme-load-path + '("c" ""))) + +(create-solarized-theme solarized-dark + (concat "This theme is obsolete since 2013-05-01; +use `solarized' instead. + +" + solarized-description) + (solarized-color-definitions)) diff --git a/solarized-definitions.el b/solarized-definitions.el index f52545a..bf01736 100644 --- a/solarized-definitions.el +++ b/solarized-definitions.el @@ -554,4 +554,11 @@ the \"Gen RGB\" column in solarized-definitions.el to improve them further." (add-to-list 'custom-theme-load-path (file-name-as-directory (file-name-directory load-file-name)))) +(defmacro create-solarized-theme (name description color-definitions) + `(progn + (deftheme ,name ,description) + (apply 'custom-theme-set-faces + ',name ,color-definitions) + (provide-theme ',name))) + (provide 'solarized-definitions) diff --git a/solarized-light-theme.el b/solarized-light-theme.el new file mode 100644 index 0000000..5abdbfa --- /dev/null +++ b/solarized-light-theme.el @@ -0,0 +1,11 @@ +(require 'solarized-definitions + (locate-file "solarized-definitions.el" custom-theme-load-path + '("c" ""))) + +(create-solarized-theme solarized-light + (concat "This theme is obsolete since 2013-05-01; +use `solarized' instead. + +" + solarized-description) + (solarized-color-definitions)) diff --git a/solarized-theme.el b/solarized-theme.el index b1a2a93..729011e 100644 --- a/solarized-theme.el +++ b/solarized-theme.el @@ -2,12 +2,5 @@ (locate-file "solarized-definitions.el" custom-theme-load-path '("c" ""))) -(defmacro create-solarized-theme () - (let ((theme-name 'solarized)) - `(progn - (deftheme ,theme-name ,solarized-description) - (apply 'custom-theme-set-faces - ',theme-name ',(solarized-color-definitions)) - (provide-theme ',theme-name)))) - -(create-solarized-theme) +(create-solarized-theme solarized + solarized-description (solarized-color-definitions))