martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix merging italic and underline faces with other fonts

Browse Source 
* lisp/faces.el (italic, underline): Leave the 'slant'
resp. 'underline' attributes even when they are not supported by
the default font.  (Bug#67269)
This commit is contained in:
Eli Zaretskii
2023-11-25 12:30:03 +02:00
parent dd1c5cca70
commit 38e2291cce
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lisp/faces.el
View File

@@ -2440,7 +2440,10 @@ If you set `term-file-prefix' to nil, this function does nothing."
'((((supports :slant italic))
:slant italic)
(((supports :underline t))
:underline t)
;; Include italic, even if it isn't supported by the default
;; font, because this face could be merged with another face
;; which uses font that does have an italic variant.
:underline t :slant italic)
(t
;; Default to italic, even if it doesn't appear to be supported,
;; because in some cases the display engine will do its own
@@ -2457,7 +2460,9 @@ If you set `term-file-prefix' to nil, this function does nothing."
(defface underline
'((((supports :underline t))
:underline t)
(((supports :weight bold))
;; Include underline, for when this face is merged with another
;; whose font does support underline.
(((supports :weight bold :underline t))
:weight bold)
(t :underline t))
"Basic underlined face."