Fix #195: Invalid face reference in persp-name.

This commit is contained in:
Vincent Zhang 2019-07-16 00:39:05 +08:00
parent bdbf45e690
commit fc7cf85f1c

View file

@ -1332,19 +1332,16 @@ Requires `eyebrowse-mode' to be enabled."
(fboundp 'get-current-persp)) (fboundp 'get-current-persp))
(let* ((persp (get-current-persp)) (let* ((persp (get-current-persp))
(name (safe-persp-name persp)) (name (safe-persp-name persp))
(icon (if (and doom-modeline-icon doom-modeline-persp-name-icon)
(doom-modeline-icon-material "aspect_ratio" :v-adjust -0.225)
"#"))
(face (if (and persp (face (if (and persp
(not (persp-contain-buffer-p (current-buffer) persp))) (not (persp-contain-buffer-p (current-buffer) persp)))
'doom-modeline-persp-buffer-not-in-persp 'doom-modeline-persp-buffer-not-in-persp
'doom-modeline-persp-name))) 'doom-modeline-persp-name))
(icon (if (and doom-modeline-icon doom-modeline-persp-name-icon)
(doom-modeline-icon-material "aspect_ratio" :v-adjust -0.225 :face face)
(propertize "#" 'face face))))
(unless (string-equal persp-nil-name name) (unless (string-equal persp-nil-name name)
(concat (concat (doom-modeline-spc)
(doom-modeline-spc) icon
(propertize icon
'face `(:inherit ,(get-text-property 0 'face icon)
:inherit ,face))
(doom-modeline-vspc) (doom-modeline-vspc)
(propertize name (propertize name
'face face 'face face