summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--unix/tkUnixFont.c4
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 937d03d..798bf4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-05-15 Jeff Hobbs <jeffh@ActiveState.com>
+
+ * unix/tkUnixFont.c: use gb2312-raw as the alias for gb2312*
+ charset fonts. gb2312.enc was made to be euc-cn for Tcl because
+ that is what is most often meant, but X really wants the original
+ (-raw) gb2312 encoding. [Bug 557030]
+
2003-05-14 Jeff Hobbs <jeffh@ActiveState.com>
* library/msgs/fr.msg: updated msg catalog. [Bug #737790] (zolli)
diff --git a/unix/tkUnixFont.c b/unix/tkUnixFont.c
index 01677af..82c85bc 100644
--- a/unix/tkUnixFont.c
+++ b/unix/tkUnixFont.c
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkUnixFont.c,v 1.18 2003/02/25 02:59:27 hobbs Exp $
+ * RCS: @(#) $Id: tkUnixFont.c,v 1.18.2.1 2003/05/15 18:06:04 hobbs Exp $
*/
#include "tkUnixInt.h"
@@ -176,7 +176,7 @@ static Tcl_ThreadDataKey dataKey;
*/
static EncodingAlias encodingAliases[] = {
- {"gb2312", "gb2312*"},
+ {"gb2312-raw", "gb2312*"},
{"big5", "big5*"},
{"cns11643-1", "cns11643*-1"},
{"cns11643-1", "cns11643*.1-0"},