From bd58f0ae7169fbdf9c432e4cf02dd42198c7f0b6 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 28 Apr 2020 17:29:11 -0400 Subject: [PATCH] Fix #2995: doom-modeline save icon & ligature conflict There is no good solution to this. I've decided the ligatures should lose a character, instead of the modeline losing an icon. --- modules/ui/pretty-code/+fira.el | 2 ++ modules/ui/pretty-code/+iosevka.el | 2 ++ 2 files changed, 4 insertions(+) diff --git a/modules/ui/pretty-code/+fira.el b/modules/ui/pretty-code/+fira.el index f1983a99d..99e9a6d08 100644 --- a/modules/ui/pretty-code/+fira.el +++ b/modules/ui/pretty-code/+fira.el @@ -119,6 +119,8 @@ (defun +pretty-code-setup-fira-ligatures-h () (set-fontset-font t '(#Xe100 . #Xe16f) +pretty-code-fira-code-font-name) + (when (featurep 'doom-modeline) + (set-fontset-font t #Xe161 nil)) (setq-default prettify-symbols-alist (append prettify-symbols-alist (mapcar #'+pretty-code--correct-symbol-bounds diff --git a/modules/ui/pretty-code/+iosevka.el b/modules/ui/pretty-code/+iosevka.el index 315dbd754..35c62c0ce 100644 --- a/modules/ui/pretty-code/+iosevka.el +++ b/modules/ui/pretty-code/+iosevka.el @@ -225,6 +225,8 @@ (defun +pretty-code-setup-iosevka-ligatures-h () (set-fontset-font t '(#Xe100 . #Xe1cc) +pretty-code-iosevka-font-name) + (when (featurep 'doom-modeline) + (set-fontset-font t #Xe161 nil)) (setq-default prettify-symbols-alist (append prettify-symbols-alist +pretty-code-iosevka-font-ligatures)))