diff options
| author | Po Lu <luangruo@yahoo.com> | 2022-02-17 01:25:24 +0000 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2022-02-17 01:25:24 +0000 |
| commit | 9780972a443d2485cb51ea35d699614ce33cf914 (patch) | |
| tree | 04f3941a220d47871eae07b47f9114c940f143c0 /src/haikufont.c | |
| parent | 8737d79be8f82bb12ca12dc1a7de37a4d2875f39 (diff) | |
| download | emacs-9780972a443d2485cb51ea35d699614ce33cf914.tar.gz emacs-9780972a443d2485cb51ea35d699614ce33cf914.tar.bz2 emacs-9780972a443d2485cb51ea35d699614ce33cf914.zip | |
Handle `unspecified' values of symbolic font values on Haiku
* src/haikufont.c (haikufont_spec_or_entity_to_pattern): Handle
`unspecified' values of symbolic values.
Diffstat (limited to 'src/haikufont.c')
| -rw-r--r-- | src/haikufont.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/haikufont.c b/src/haikufont.c index e9e788e8e86..5099285f100 100644 --- a/src/haikufont.c +++ b/src/haikufont.c @@ -440,35 +440,35 @@ haikufont_spec_or_entity_to_pattern (Lisp_Object ent, } tem = FONT_SLANT_SYMBOLIC (ent); - if (!NILP (tem)) + if (!NILP (tem) && !EQ (tem, Qunspecified)) { ptn->specified |= FSPEC_SLANT; ptn->slant = haikufont_lisp_to_slant (tem); } tem = FONT_WEIGHT_SYMBOLIC (ent); - if (!NILP (tem)) + if (!NILP (tem) && !EQ (tem, Qunspecified)) { ptn->specified |= FSPEC_WEIGHT; ptn->weight = haikufont_lisp_to_weight (tem); } tem = FONT_WIDTH_SYMBOLIC (ent); - if (!NILP (tem)) + if (!NILP (tem) && !EQ (tem, Qunspecified)) { ptn->specified |= FSPEC_WIDTH; ptn->width = haikufont_lisp_to_width (tem); } tem = AREF (ent, FONT_SPACING_INDEX); - if (FIXNUMP (tem)) + if (!NILP (tem) && !EQ (tem, Qunspecified)) { ptn->specified |= FSPEC_SPACING; ptn->mono_spacing_p = XFIXNUM (tem) != FONT_SPACING_PROPORTIONAL; } tem = AREF (ent, FONT_FAMILY_INDEX); - if (!NILP (tem) && + if (!NILP (tem) && !EQ (tem, Qunspecified) && (list_p && !haikufont_maybe_handle_special_family (tem, ptn))) { ptn->specified |= FSPEC_FAMILY; |