mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-02-16 17:24:23 +00:00
Fix merging italic and underline faces with other fonts
* 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:
parent
dd1c5cca70
commit
38e2291cce
1 changed files with 7 additions and 2 deletions
|
|
@ -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."
|
||||
|
|
|
|||
Loading…
Reference in a new issue