TakeV
/
spacemacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

theming: robustness 

Disable all applied themes in all cases, when a theme is applied
This commit is contained in:
Eivind Fonn 2017-06-16 09:34:39 +02:00
parent e07f805606
commit ef12c6073a
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/core-spacemacs.el
View File

@ -112,7 +112,7 @@ the final step of executing code in `emacs-startup-hook'.")
(setq icon-title-format '((:eval (spacemacs/title-prepare dotspacemacs-icon-title-format))))
(setq icon-title-format frame-title-format)))
;; theme
(spacemacs/load-default-theme spacemacs--fallback-theme)
(spacemacs/load-default-theme spacemacs--fallback-theme 'disable)
;; font
(spacemacs|do-after-display-system-init
;; If you are thinking to remove this call to `message', think twice. You'll

7
core/core-themes-support.el
View File

@ -210,12 +210,12 @@ package name does not match theme name + `-theme' suffix.")
pkg-name)))
dir))
(defun spacemacs/load-default-theme (&optional fallback-theme)
(defun spacemacs/load-default-theme (&optional fallback-theme disable)
"Load default theme.
Default theme is the car of `dotspacemacs-themes'.
If FALLBACK-THEME is non-nil it must be a package name which will be loaded if
THEME cannot be applied."
(spacemacs/load-theme (car dotspacemacs-themes) fallback-theme))
(spacemacs/load-theme (car dotspacemacs-themes) fallback-theme disable))
(defun spacemacs/load-theme (theme &optional fallback-theme disable)
"Apply user theme.
@ -285,7 +285,6 @@ THEME."
"Cycle through themes defined in `dotspacemacs-themes.'"
(interactive)
(when spacemacs--cur-theme
(disable-theme spacemacs--cur-theme)
;; if current theme isn't in cycleable themes, start over
(setq spacemacs--cycle-themes
(or (cdr (memq spacemacs--cur-theme dotspacemacs-themes))
@ -294,7 +293,7 @@ THEME."
(let ((progress-reporter
(make-progress-reporter
(format "Loading theme %s..." spacemacs--cur-theme))))
(spacemacs/load-theme spacemacs--cur-theme)
(spacemacs/load-theme spacemacs--cur-theme nil 'disable)
(progress-reporter-done progress-reporter)))
(defadvice load-theme (after spacemacs/load-theme-adv activate)