diff options
| author | dgp <dgp@users.sourceforge.net> | 2020-10-13 15:47:06 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2020-10-13 15:47:06 (GMT) |
| commit | 4ef13c6d1a5de7d44fe0c2acc6100b9f5a93d6fc (patch) | |
| tree | 1f5583a4651b54527c2cbbda7df365562020260b /unix | |
| parent | bdb5f43c6bd903df6f688c55fe5c9d0aecc993a9 (diff) | |
| parent | ad0d8ceeb439f7151ce2378527b87cf81e17d1bd (diff) | |
| download | tk-4ef13c6d1a5de7d44fe0c2acc6100b9f5a93d6fc.zip tk-4ef13c6d1a5de7d44fe0c2acc6100b9f5a93d6fc.tar.gz tk-4ef13c6d1a5de7d44fe0c2acc6100b9f5a93d6fc.tar.bz2 | |
merge 8.6
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/tkUnixRFont.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/unix/tkUnixRFont.c b/unix/tkUnixRFont.c index f57eaa5..340b5a9 100644 --- a/unix/tkUnixRFont.c +++ b/unix/tkUnixRFont.c @@ -61,10 +61,6 @@ static Tcl_ThreadDataKey dataKey; * the TIP 59 configuration database. */ -#ifndef TCL_CFGVAL_ENCODING -#define TCL_CFGVAL_ENCODING "ascii" -#endif - static int utf8ToUcs4(const char *source, FcChar32 *c, int numBytes) { if (numBytes >= 6) { @@ -82,7 +78,7 @@ TkpFontPkgInit( { 0,0 } }; - Tcl_RegisterConfig(mainPtr->interp, "tk", cfg, TCL_CFGVAL_ENCODING); + Tcl_RegisterConfig(mainPtr->interp, "tk", cfg, "utf-8"); } static XftFont * |