From ae51fd7a77645fc660b32d9cf7d24e1ca8631a95 Mon Sep 17 00:00:00 2001 From: duianto Date: Sat, 17 Aug 2019 10:46:35 +0200 Subject: [PATCH] Revert "Improve theme handling to support themes using `spacemacs-theme` custom api" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 5f308b0306d44b20d200ee2bc490540e1c9ee149. This message is shown on startup: spacemacs/startup-hook: Symbol’s value as variable is void: spacemacs-theme-custom-colors and it broke several things. --- core/core-spacemacs.el | 4 ---- core/core-themes-support.el | 1 - 2 files changed, 5 deletions(-) diff --git a/core/core-spacemacs.el b/core/core-spacemacs.el index 97e616042..5161d5b96 100644 --- a/core/core-spacemacs.el +++ b/core/core-spacemacs.el @@ -221,10 +221,6 @@ Note: the hooked function is not executed when in dumped mode." "Calling dotfile user config...") (dotspacemacs|call-func dotspacemacs/emacs-custom-settings "Calling dotfile Emacs custom settings...") - (defconst spacemacs-original-spacemacs-custom-colors spacemacs-theme-custom-colors - "Value of spacemacs-theme-custom-colors as it was after running user-config. - -Needs to be saved as some themes customise this variable and we can otherwise not restore the original setting.") ;; don't write custom settings into the dotfile before loading them, ;; otherwise https://github.com/syl20bnr/spacemacs/issues/10504 happens (spacemacs/initialize-custom-file-sync) diff --git a/core/core-themes-support.el b/core/core-themes-support.el index c9dab9c56..6ae5c1bb0 100644 --- a/core/core-themes-support.el +++ b/core/core-themes-support.el @@ -370,7 +370,6 @@ THEME." "Cycle through themes defined in `dotspacemacs-themes'. When BACKWARD is non-nil, or with universal-argument, cycle backwards." (interactive "P") - (setq spacemacs-theme-custom-colors spacemacs-original-spacemacs-custom-colors) (let* ((themes (if backward (reverse dotspacemacs-themes) dotspacemacs-themes)) (next-theme (car (or (cdr (memq spacemacs--cur-theme themes)) ;; if current theme isn't in cycleable themes, start