github/doom-modeline
1
0
Fork 0
mirror of https://github.com/correl/doom-modeline.git synced 2024-11-23 19:19:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix #168: when no icons: invalid face attribute and reference.

Browse source
This commit is contained in:
Vincent Zhang 2019-05-07 00:34:17 +08:00
parent 2bbfcbe685
commit e902f41638
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doom-modeline-segments.el
View file

@ -588,13 +588,13 @@ Uses `all-the-icons-octicon' to fetch the icon."
(concat (concat
(propertize " " 'face (if active 'mode-line 'mode-line-inactive)) (propertize " " 'face (if active 'mode-line 'mode-line-inactive))
(propertize icon 'face `(:inherit (propertize icon 'face `(:inherit
,(if doom-modeline-icon (get-text-property 0 'face icon)) ,(get-text-property 0 'face icon)
:inherit :inherit
,(if active 'mode-line 'mode-line-inactive))) ,(if active 'mode-line 'mode-line-inactive)))
(if doom-modeline-icon (if doom-modeline-icon
(if active doom-modeline-vspc doom-modeline-inactive-vspc)) (if active doom-modeline-vspc doom-modeline-inactive-vspc))
(propertize text 'face `(:inherit (propertize text 'face `(:inherit
,(if doom-modeline-icon (get-text-property 0 'face text)) ,(get-text-property 0 'face text)
:inherit :inherit
,(if active 'mode-line 'mode-line-inactive))) ,(if active 'mode-line 'mode-line-inactive)))
(propertize " " 'face (if active 'mode-line 'mode-line-inactive)))))) (propertize " " 'face (if active 'mode-line 'mode-line-inactive))))))
@ -913,7 +913,7 @@ icons."
'face (if active 'mode-line 'mode-line-inactive)) 'face (if active 'mode-line 'mode-line-inactive))
(when icon (when icon
(propertize icon 'face `(:inherit (propertize icon 'face `(:inherit
,(if doom-modeline-icon (get-text-property 0 'face icon)) ,(get-text-property 0 'face icon)
:inherit :inherit
,(if active 'mode-line 'mode-line-inactive)))) ,(if active 'mode-line 'mode-line-inactive))))
(when (and doom-modeline-icon icon text) (when (and doom-modeline-icon icon text)
@ -2018,7 +2018,7 @@ we don't want to remove that so we just return the original."
(if percent-str (if percent-str
(concat (concat
(propertize icon 'face `(:inherit (propertize icon 'face `(:inherit
,(if doom-modeline-icon (get-text-property 0 'face icon)) ,(get-text-property 0 'face icon)
:inherit ,face) :inherit ,face)
'help-echo help-echo) 'help-echo help-echo)
(if doom-modeline-icon (if doom-modeline-icon