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

Fix #2995: ligature & all-the-icons conflicts

Browse source 
See domtronn/all-the-icons.el#174
This commit is contained in:
Henrik Lissner 2020-04-30 17:02:24 -04:00
parent 798b5bdaea
commit c25f88c874
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
4 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/ui/pretty-code/+fira.el
View file

@ -118,9 +118,7 @@
("*" . #Xe16f)))
(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))
(set-fontset-font t '(#Xe100 . #Xe16f) +pretty-code-fira-code-font-name nil 'prepend)
(setq-default prettify-symbols-alist
(append prettify-symbols-alist
(mapcar #'+pretty-code--correct-symbol-bounds

2
modules/ui/pretty-code/+hasklig.el
View file

@ -49,7 +49,7 @@
(defun +pretty-code-setup-hasklig-ligatures-h ()
(set-fontset-font t '(#Xe100 . #Xe129) +pretty-code-hasklig-font-name)
(set-fontset-font t '(#Xe100 . #Xe129) +pretty-code-hasklig-font-name nil 'prepend)
(setq-default prettify-symbols-alist
(append prettify-symbols-alist
(mapcar #'+pretty-code--correct-symbol-bounds

4
modules/ui/pretty-code/+iosevka.el
View file

@ -224,9 +224,7 @@
"Defines the character mappings for ligatures for Iosevka.")
(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))
(set-fontset-font t '(#Xe100 . #Xe1cc) +pretty-code-iosevka-font-name nil 'prepend)
(setq-default prettify-symbols-alist
(append prettify-symbols-alist
+pretty-code-iosevka-font-ligatures)))