[Emacs] Fix org faces

Between Emacs 28.0.50.145785 and Emacs 28.0.50.146000, a commit broke my
face config, and inheriting from `fixed-pitch' no longer made my faces
fixed-pitched. This commit therefore sets directly the font of the faces
than need to be fixed-pitched instead of relying on the `fixed-pitch'
face.
This commit is contained in:
Lucien Cartier-Tilet 2021-01-04 14:13:07 +01:00
parent b027b2b03b
commit fcc16e8f98
Signed by: phundrak
GPG Key ID: BD7789E705CB8DCA
2 changed files with 10 additions and 9 deletions

View File

@ -182,6 +182,7 @@ This function is called at the very end of Spacemacs initialization."
'(org-block-begin-line ((t (:inherit fixed-pitch :height 0.8)))) '(org-block-begin-line ((t (:inherit fixed-pitch :height 0.8))))
'(org-checkbox ((t (:inherit (org-todo shadow fixed-pitch))))) '(org-checkbox ((t (:inherit (org-todo shadow fixed-pitch)))))
'(org-code ((t (:inherit (shadow fixed-pitch))))) '(org-code ((t (:inherit (shadow fixed-pitch)))))
'(org-date ((t (:inherit fixed-pitch :height 0.8 :foreground "#ebcb8b"))))
'(org-document-info ((t (:foreground "#d08770")))) '(org-document-info ((t (:foreground "#d08770"))))
'(org-document-info-keyword ((t (:inherit (shadow fixed-pitch))))) '(org-document-info-keyword ((t (:inherit (shadow fixed-pitch)))))
'(org-document-title ((t (:font "Charis SIL" :height 1.0 :inherit default :weight bold :foreground "#bf616a" :height 2.0 :italic t)))) '(org-document-title ((t (:font "Charis SIL" :height 1.0 :inherit default :weight bold :foreground "#bf616a" :height 2.0 :italic t))))

View File

@ -2201,7 +2201,7 @@ Fonts will play an important part in this, but so will colors and font size. The
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(let* ((font `(:font "Charis SIL" :height 1.0)) (let* ((font `(:font "Charis SIL" :height 1.0))
(head `(:inherit default :weight bold)) (head `(:inherit default :weight bold))
(fixed `(:inherit fixed-pitch :height 0.8))) (fixed `(:font "Cascadia Code" :height 0.8)))
(custom-theme-set-faces (custom-theme-set-faces
'user 'user
`(org-level-1 ((t (,@font ,@head :foreground ,phundrak/nord15 :height 1.75)))) `(org-level-1 ((t (,@font ,@head :foreground ,phundrak/nord15 :height 1.75))))
@ -2224,12 +2224,12 @@ Fonts will play an important part in this, but so will colors and font size. The
`(org-drawer ((t (,@fixed :foreground ,phundrak/nord10))) t) `(org-drawer ((t (,@fixed :foreground ,phundrak/nord10))) t)
`(org-table ((t (,@fixed :foreground ,phundrak/nord14))) t) `(org-table ((t (,@fixed :foreground ,phundrak/nord14))) t)
`(org-date ((t (,@fixed :foreground ,phundrak/nord13))) t) `(org-date ((t (,@fixed :foreground ,phundrak/nord13))) t)
'(org-code ((t (:inherit (shadow fixed-pitch))))) '(org-code ((t (:inherit (shadow fixed-pitch) ,@fixed))))
'(org-verbatim ((t (:inherit (shadow fixed-pitch))))) '(org-verbatim ((t (:inherit (shadow fixed-pitch) ,@fixed))))
'(org-document-info-keyword ((t (:inherit (shadow fixed-pitch))))) '(org-document-info-keyword ((t (:inherit (shadow fixed-pitch) ,@fixed))))
'(org-tag ((t (:inherit (shadow fixed-pitch) :weight bold)))) '(org-tag ((t (:inherit (shadow fixed-pitch) ,@fixed :weight bold))))
'(org-meta-line ((t (:inherit (font-lock-comment-face fixed-pitch) :height 0.8)))) '(org-meta-line ((t (:inherit (font-lock-comment-face fixed-pitch) ,@fixed :height 0.8))))
`(org-special-keyword ((t (:inherit (font-lock-comment-face fixed-pitch) :height 0.8 :foreground ,phundrak/nord15)))) `(org-special-keyword ((t (:inherit (font-lock-comment-face fixed-pitch) ,@fixed :height 0.8 :foreground ,phundrak/nord15))))
'(org-checkbox ((t (:inherit (org-todo shadow fixed-pitch))))) '(org-checkbox ((t (:inherit (org-todo shadow fixed-pitch)))))
`(org-document-info ((t (:foreground ,phundrak/nord12)))) `(org-document-info ((t (:foreground ,phundrak/nord12))))
`(org-link ((t (:foreground ,phundrak/nord8 :underline t)))))) `(org-link ((t (:foreground ,phundrak/nord8 :underline t))))))