emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

editor/evil: simplify cursor color change logic

Browse source 
Fixes race conditions where the cached cursor's color doesn't match the
loaded theme's.
This commit is contained in:
Henrik Lissner 2021-05-28 14:06:16 -04:00
parent a600e5949b
commit 69ea5c2020
1 changed files with 3 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

15
modules/editor/evil/config.el
View file

@ -83,20 +83,11 @@ directives. By default, this only recognizes C directives.")
("^\\*Command Line" :size 8))))) ("^\\*Command Line" :size 8)))))
;; Change the cursor color in emacs state. We do it this roundabout way ;; Change the cursor color in emacs state. We do it this roundabout way
;; instead of changing `evil-default-cursor' (or `evil-emacs-state-cursor') so ;; to ensure changes in theme doesn't break these colors.
;; it won't interfere with users who have changed these variables.
(defvar +evil--default-cursor-color "#ffffff")
(defvar +evil--emacs-cursor-color "#ff9999")
(add-hook! 'doom-load-theme-hook
(defun +evil-update-cursor-color-h ()
(setq +evil--default-cursor-color (face-background 'cursor)
+evil--emacs-cursor-color (face-foreground 'warning))))
(defun +evil-default-cursor-fn () (defun +evil-default-cursor-fn ()
(evil-set-cursor-color +evil--default-cursor-color)) (evil-set-cursor-color (face-background 'cursor)))
(defun +evil-emacs-cursor-fn () (defun +evil-emacs-cursor-fn ()
(evil-set-cursor-color +evil--emacs-cursor-color)) (evil-set-cursor-color (face-foreground 'warning)))
(setq-hook! 'after-change-major-mode-hook evil-shift-width tab-width) (setq-hook! 'after-change-major-mode-hook evil-shift-width tab-width)