gitback/doomemacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4351474bf3
doomemacs/core/autoload/themes.el

51 lines
1.8 KiB
EmacsLisp
Raw Normal View History

Fix file paths in comment headings
2019-08-07 02:45:55 +08:00
;;; core/autoload/themes.el -*- lexical-binding: t; -*-
Add autoload/themes.el library
2019-07-23 20:31:00 +08:00
Add nested face support to custom-theme-set-faces! And convert it and custom-set-faces! to functions because they didn't need to be macros.
2019-07-25 18:21:26 +08:00
(defun doom--custom-theme-set-face (spec)
(cond ((listp (car spec))
(cl-loop for face in (car spec)
Fix custom-theme-set-faces! The body was still quoted from when it was a macro.
2019-07-28 20:09:31 +08:00
collect
Fix the multi-face form of custom-set-faces!
2019-09-15 00:09:58 +08:00
(car (doom--custom-theme-set-face (cons face (cdr spec))))))
Fix custom-theme-set-faces! The body was still quoted from when it was a macro.
2019-07-28 20:09:31 +08:00
((keywordp (cadr spec))
Add nested face support to custom-theme-set-faces! And convert it and custom-set-faces! to functions because they didn't need to be macros.
2019-07-25 18:21:26 +08:00
`((,(car spec) ((t ,(cdr spec))))))
(`((,(car spec) ,(cdr spec))))))
Add autoload/themes.el library
2019-07-23 20:31:00 +08:00
;;;###autoload
Defer evaluation of custom-set-faces!'s arguments ...until the theme has first loaded. You'll need to set `doom-theme` to nil if you want to use this macro without a theme!
2019-10-25 07:42:07 +08:00
(defmacro custom-theme-set-faces! (theme &rest specs)
Add nested face support to custom-theme-set-faces! And convert it and custom-set-faces! to functions because they didn't need to be macros.
2019-07-25 18:21:26 +08:00
"Apply a list of face SPECS as user customizations for THEME.
Add autoload/themes.el library
2019-07-23 20:31:00 +08:00
THEME can be a single symbol or list thereof. If nil, apply these settings to
Remove examples in custom-*set-faces! They're already in docs/api.org, which helpful buffers will display alongside a function/macro's documentation.
2019-07-28 20:10:25 +08:00
all themes. It will apply to all themes once they are loaded."
Defer evaluation of custom-set-faces!'s arguments ...until the theme has first loaded. You'll need to set `doom-theme` to nil if you want to use this macro without a theme!
2019-10-25 07:42:07 +08:00
(declare (indent defun))
Fix void-variable themes error at startup If lexical-binding isn't enabled (with ';; -*- lexical-binding: t; -*-' at the top of your private config), custom-set-theme! and custom-theme-set-faces! throw this error. Since these macros are commonly used in user configs, where I can't police lexical-binding, I've refactored it to not rely on it.
2019-10-28 02:27:29 +08:00
`(let ((fn (gensym "doom--customize-themes-h-")))
Defer evaluation of custom-set-faces!'s arguments ...until the theme has first loaded. You'll need to set `doom-theme` to nil if you want to use this macro without a theme!
2019-10-25 07:42:07 +08:00
(fset
fn (lambda ()
Fix void-variable themes error at startup If lexical-binding isn't enabled (with ';; -*- lexical-binding: t; -*-' at the top of your private config), custom-set-theme! and custom-theme-set-faces! throw this error. Since these macros are commonly used in user configs, where I can't police lexical-binding, I've refactored it to not rely on it.
2019-10-28 02:27:29 +08:00
(dolist (theme (doom-enlist (or ,theme 'user)))
Defer evaluation of custom-set-faces!'s arguments ...until the theme has first loaded. You'll need to set `doom-theme` to nil if you want to use this macro without a theme!
2019-10-25 07:42:07 +08:00
(when (or (eq theme 'user)
(custom-theme-enabled-p theme))
Fix custom-set-theme-faces! applying only to 'user
2019-11-23 02:13:00 +08:00
(apply #'custom-theme-set-faces theme
Defer evaluation of custom-set-faces!'s arguments ...until the theme has first loaded. You'll need to set `doom-theme` to nil if you want to use this macro without a theme!
2019-10-25 07:42:07 +08:00
(mapcan #'doom--custom-theme-set-face
(list ,@specs)))))))
(when (or doom-init-theme-p (null doom-theme))
(funcall fn))
(add-hook 'doom-load-theme-hook fn 'append)))
Add autoload/themes.el library
2019-07-23 20:31:00 +08:00
;;;###autoload
Defer evaluation of custom-set-faces!'s arguments ...until the theme has first loaded. You'll need to set `doom-theme` to nil if you want to use this macro without a theme!
2019-10-25 07:42:07 +08:00
(defmacro custom-set-faces! (&rest specs)
Add nested face support to custom-theme-set-faces! And convert it and custom-set-faces! to functions because they didn't need to be macros.
2019-07-25 18:21:26 +08:00
"Apply a list of face SPECS as user customizations.
Add autoload/themes.el library
2019-07-23 20:31:00 +08:00
This is a drop-in replacement for `custom-set-face' that allows for a simplified
Remove examples in custom-*set-faces! They're already in docs/api.org, which helpful buffers will display alongside a function/macro's documentation.
2019-07-28 20:10:25 +08:00
face format."
Defer evaluation of custom-set-faces!'s arguments ...until the theme has first loaded. You'll need to set `doom-theme` to nil if you want to use this macro without a theme!
2019-10-25 07:42:07 +08:00
(declare (indent defun))
`(custom-theme-set-faces! 'user ,@specs))
Add autoload/themes.el library
2019-07-23 20:31:00 +08:00
Appease byte-compiler-san-chan-sensei-sama-chama Praise be.
2019-07-28 20:16:33 +08:00
(defvar doom--prefer-theme-elc)
Add autoload/themes.el library
2019-07-23 20:31:00 +08:00
;;;###autoload
(defun doom/reload-theme ()
"Reload the current color theme."
(interactive)
(let ((theme (or (car-safe custom-enabled-themes) doom-theme)))
(when theme
(mapc #'disable-theme custom-enabled-themes))
Update doom/reload-{theme,font} To reflect changes introduced in 17174e143
2019-09-21 07:51:42 +08:00
(load-theme doom-theme 'noconfirm)
(doom/reload-font)))
Reference in New Issue Copy Permalink