summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2024-01-03 14:58:37 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2024-01-03 14:58:37 (GMT)
commitdd16e78eebdc15d760fa353c42b09d5be6cfec1b (patch)
tree215a80dfc9c9bce7d4d84921e0de74943b20cf32 /unix
parent37813f8effdab70e2822a129459cd6679ea93c75 (diff)
parent3c699ca0fa3870fce82abf47ed3d2ea99043bdfa (diff)
downloadtk-dd16e78eebdc15d760fa353c42b09d5be6cfec1b.zip
tk-dd16e78eebdc15d760fa353c42b09d5be6cfec1b.tar.gz
tk-dd16e78eebdc15d760fa353c42b09d5be6cfec1b.tar.bz2
Merge 8.6
Diffstat (limited to 'unix')
-rw-r--r--unix/tkUnixFont.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/unix/tkUnixFont.c b/unix/tkUnixFont.c
index 56d1797..26652c7 100644
--- a/unix/tkUnixFont.c
+++ b/unix/tkUnixFont.c
@@ -105,7 +105,7 @@ typedef struct UnixFont {
* order to draw/measure all the characters
* encountered by this font so far. All fonts
* start off with one SubFont initialized by
- * AllocFont() from the original set of font
+ * InitFont() from the original set of font
* attributes. Usually points to
* staticSubFonts, but may point to malloced
* space if there are lots of SubFonts. */
@@ -2031,16 +2031,16 @@ FindSubFontForChar(
ch = 0xFFFD;
}
+ if (FontMapLookup(&fontPtr->controlSubFont, ch)) {
+ return &fontPtr->controlSubFont;
+ }
+
for (i = 0; i < fontPtr->numSubFonts; i++) {
if (FontMapLookup(&fontPtr->subFontArray[i], ch)) {
return &fontPtr->subFontArray[i];
}
}
- if (FontMapLookup(&fontPtr->controlSubFont, ch)) {
- return &fontPtr->controlSubFont;
- }
-
/*
* Keep track of all face names that we check, so we don't check some name
* multiple times if it can be reached by multiple paths.