--- rxvt-unicode/src/encoding.C	2004/08/04 03:29:28	1.18
+++ rxvt-unicode/src/encoding.C	2005/09/15 21:13:39	1.22
@@ -60,7 +60,7 @@
   { "USASCII",		CS_US_ASCII         },
   { "ANSIX341968",	CS_US_ASCII         },
                                             
-  { "KOI8R",		CS_KOI8_R           },
+  { "KOI8R*",		CS_KOI8_R           },
   { "GOST1976874*",     CS_KOI8_R           },
   { "KOI8RU",		CS_KOI8_U           },
   { "KOI8U",		CS_KOI8_U           },
@@ -83,6 +83,7 @@
   { "BIG5ETEN*",	CS_BIG5_EXT         },
   { "BIG5*",		CS_BIG5             },
   { "GB2312*",		CS_GB2312_1980_0    },
+  { "GBK*",		CS_GBK_0            },
   { "GB6345*",		CS_GB2312_1980_0    }, // slightly different to gb2312??
   { "GB8565*",		CS_GB2312_1980_0    }, // a superset of gb2312??
   { "GB13000*",		CS_UNICODE          },
@@ -179,12 +180,13 @@
 
 #include "table/ksc5601_1987_0.h"
 
-//#define ENCODING_CN
+//#define ENCODING_ZH
 
-#include "table/gb2312_1980_0.h"
 #include "table/big5.h"
+#include "table/gbk_0.h"
+#include "table/gb2312_1980_0.h"
 
-//#define ENCODING_CN_EXT
+//#define ENCODING_ZH_EXT
 
 #include "table/cns11643_1992_1.h"
 #include "table/cns11643_1992_2.h"
@@ -254,6 +256,7 @@
   ENC (ksc5601_1987_0),
 
   ENC (gb2312_1980_0),
+  ENC (gbk_0),
 
   ENC (cns11643_1992_1),
   ENC (cns11643_1992_2),
@@ -306,5 +309,6 @@
 
 bool unicode::is_space (unicode_t c)
 {
-  return IS_SPACE (c);
+  return IS_SPACE (c)
+         || c == 0x09; // exclude tabs, too, as we store them in the buffer
 }