From e7d5da2686e96c098403e237a9042a43e1c8b788 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 3 Sep 2018 03:25:06 +0200 Subject: [PATCH] feature/evil: detect frame cursor-color #851 In case set-cursor-color was used early in the config process (e.g. in ~/.doom.d/init.el), detect it before resorting to #FFFFFF as a default. --- modules/feature/evil/config.el | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/feature/evil/config.el b/modules/feature/evil/config.el index 23497ce47..9ade07129 100644 --- a/modules/feature/evil/config.el +++ b/modules/feature/evil/config.el @@ -51,7 +51,10 @@ line with a linewise comment.") (add-hook 'doom-post-init-hook #'+evil|init-popup-rules) ;; Change the cursor color in emacs mode - (defvar +evil--default-cursor-color "#ffffff") + (defvar +evil--default-cursor-color + (or (ignore-errors (frame-parameter nil 'cursor-color)) + "#ffffff")) + (defun +evil-default-cursor () (set-cursor-color +evil--default-cursor-color)) (defun +evil-emacs-cursor () (set-cursor-color (face-foreground 'warning)))