[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 357cd83875a: Remove obsolete workaround
From: |
Po Lu |
Subject: |
master 357cd83875a: Remove obsolete workaround |
Date: |
Fri, 20 Sep 2024 10:28:49 -0400 (EDT) |
branch: master
commit 357cd83875a4dd0ec81d1af2b91270cb57973931
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>
Remove obsolete workaround
* src/fontset.c (fontset_find_font): Don't refuse to cache
font objects whose registries do not agree with the font
specs. (bug#73363)
---
src/fontset.c | 26 --------------------------
1 file changed, 26 deletions(-)
diff --git a/src/fontset.c b/src/fontset.c
index 16d14669c89..755942138f7 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -668,34 +668,8 @@ fontset_find_font (Lisp_Object fontset, int c, struct face
*face,
font_object = font_open_for_lface (f, font_entity, face->lface,
FONT_DEF_SPEC (font_def));
- /* If the font registry is not the same as explicitly
- specified in the font spec, do not cache the font.
- TrueType fonts have contrived character map selection
- semantics which makes determining the repertory at font
- spec matching time unduly expensive. */
-
- {
- Lisp_Object spec;
-
- spec = FONT_DEF_SPEC (font_def);
-
- if (!NILP (font_object)
- && !NILP (AREF (spec, FONT_REGISTRY_INDEX))
- && !NILP (AREF (font_object, FONT_REGISTRY_INDEX))
- && !EQ (AREF (spec, FONT_REGISTRY_INDEX),
- AREF (font_object, FONT_REGISTRY_INDEX))
- /* See sfntfont_registries_compatible_p in
- sfntfont.c. */
- && !(EQ (AREF (spec, FONT_REGISTRY_INDEX),
- Qiso8859_1)
- && EQ (AREF (font_object, FONT_REGISTRY_INDEX),
- Qiso10646_1)))
- goto strangeness;
- }
-
if (NILP (font_object))
{
- strangeness:
/* Something strange happened, perhaps because of a
Font-backend problem. To avoid crashing, record
that this spec is unusable. It may be better to find
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 357cd83875a: Remove obsolete workaround,
Po Lu <=