From c98d022cb1e9b57d534e9889b850b7b0267bad0b Mon Sep 17 00:00:00 2001 From: Sameer Rahmani Date: Thu, 19 Apr 2018 01:07:45 +0100 Subject: [PATCH] color-theme removed as dependency --- lib/extensions/editor-theme.el | 2 -- lib/fg42/base.el | 9 +++------ lib/themes/color-theme-doom-one.el | 2 +- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/lib/extensions/editor-theme.el b/lib/extensions/editor-theme.el index a132fb1..30c4cc6 100644 --- a/lib/extensions/editor-theme.el +++ b/lib/extensions/editor-theme.el @@ -2,8 +2,6 @@ (require 'fg42/extension) ;; Dependencies ---------------------------------- -(depends-on 'color-theme) - (defun extensions/editor-theme-initialize () "Initialize 'editor-theme' extension." (message "Initializing 'editor-theme' extension.") diff --git a/lib/fg42/base.el b/lib/fg42/base.el index 93ad281..c53e955 100644 --- a/lib/fg42/base.el +++ b/lib/fg42/base.el @@ -16,13 +16,10 @@ local should be 't' if theme is on FG42 it self" ;; Functions ------------------------------ (defun load-default-theme () "Load the given theme name" - (make-directory (file-name-as-directory (expand-file-name "themes" (file-name-directory (locate-library "color-theme")))) t) (require default-theme) - (eval-after-load "color-theme" - '(progn - (color-theme-initialize) - (funcall (symbol-function default-theme)))) - (require 'color-theme)) + ;;(load-theme default-theme) + ;;(enable-theme default-theme)) + (funcall (symbol-function default-theme))) (defun load--extension (extension) "Load a single extension and call its :on-initialize function" diff --git a/lib/themes/color-theme-doom-one.el b/lib/themes/color-theme-doom-one.el index dc6515c..2482569 100644 --- a/lib/themes/color-theme-doom-one.el +++ b/lib/themes/color-theme-doom-one.el @@ -9,7 +9,7 @@ doom-themes-enable-italic t) ; if nil, italics is universally disabled (load-theme 'doom-one t) - + (enable-theme 'doom-one) ;; brighten buffers (that represent real files) (add-hook 'after-change-major-mode-hook #'turn-on-solaire-mode)