From 89f5af81041138e208d0257b4750bfae67dc2920 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 26 Aug 2024 19:36:10 -0400 Subject: [PATCH] refactor(fold): move +fold-hideshow-folded-face & unstyle +ts-fold-replacement-face It is the theme(s) jurisdiction to impose modify external faces. `custom-set-faces!` should be avoided from within modules, in general. --- modules/editor/fold/autoload/hideshow.el | 5 ----- modules/editor/fold/config.el | 11 +++++------ 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/modules/editor/fold/autoload/hideshow.el b/modules/editor/fold/autoload/hideshow.el index a95f89535..1ee7ff62f 100644 --- a/modules/editor/fold/autoload/hideshow.el +++ b/modules/editor/fold/autoload/hideshow.el @@ -1,10 +1,5 @@ ;;; editor/fold/autoload/hideshow.el -*- lexical-binding: t; -*- -(defface +fold-hideshow-folded-face - `((t (:inherit font-lock-comment-face :weight light))) - "Face to hightlight `hideshow' overlays." - :group 'doom-themes) - ;;;###autoload (defun +fold-hideshow-haml-forward-sexp-fn (arg) (haml-forward-sexp arg) diff --git a/modules/editor/fold/config.el b/modules/editor/fold/config.el index 60b50f027..6bae1a36e 100644 --- a/modules/editor/fold/config.el +++ b/modules/editor/fold/config.el @@ -8,6 +8,11 @@ this." :type 'string :group '+fold) +(defface +fold-hideshow-folded-face + `((t (:inherit font-lock-comment-face :weight light))) + "Face to hightlight `hideshow' overlays." + :group 'doom-themes) + ;; ;;; Global config @@ -109,11 +114,5 @@ this." :when (modulep! :tools tree-sitter) :after tree-sitter :config - ;; we want to use our own face so we nullify this one to have no effect and - ;; make it more similar to hideshows - (custom-set-faces! '(ts-fold-replacement-face :foreground unspecified - :box nil - :inherit font-lock-comment-face - :weight light)) (setq ts-fold-replacement +fold-ellipsis) (global-ts-fold-mode +1))