head	1.2;
access;
symbols
	RELEASE_5_0_0:1.1
	RELEASE_4_7_0:1.1
	RELEASE_4_6_2:1.1
	RELEASE_4_6_1:1.1
	RELEASE_4_6_0:1.1
	RELEASE_5_0_DP1:1.1
	RELEASE_4_5_0:1.1
	RELEASE_4_4_0:1.1
	RELEASE_4_3_0:1.1;
locks; strict;
comment	@# @;


1.2
date	2003.02.15.00.16.17;	author naddy;	state dead;
branches;
next	1.1;

1.1
date	2000.12.24.20.27.20;	author keith;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Update to 0.9.1.

PR:		48254
Submitted by:	Yu-Shun Wang <yushunwa@@isi.edu>
@
text
@--- src/options.c.orig	Tue Jan 18 22:17:19 2000
+++ src/options.c	Sun Dec 24 10:56:22 2000
@@@@ -362,7 +362,7 @@@@
       OPT_LONG("mfont2", "multichar font 2", &rs_mfont[2]),
       OPT_LONG("mfont3", "multichar font 3", &rs_mfont[3]),
       OPT_LONG("mfont4", "multichar font 4", &rs_mfont[4]),
-      OPT_LONG("mencoding", "multichar encoding mode (eucj or sjis or euckr)",
+      OPT_LONG("mencoding", "multichar encoding mode (eucj or sjis or euckr or big5 or gb)",
 	       &rs_multichar_encoding),
 #endif /* MULTI_CHARSET */
 #ifdef USE_XIM
@@@@ -2794,12 +2794,13 @@@@
     if (rs_multichar_encoding != NULL) {
       if (BEG_STRCASECMP(rs_multichar_encoding, "eucj")
 	  && BEG_STRCASECMP(rs_multichar_encoding, "sjis")
-	  && BEG_STRCASECMP(rs_multichar_encoding, "euckr")) {
+	  && BEG_STRCASECMP(rs_multichar_encoding, "euckr")
+	  && BEG_STRCASECMP(rs_multichar_encoding, "big5")
+	  && BEG_STRCASECMP(rs_multichar_encoding, "gb")) {
 	print_error("Parse error in file %s, line %lu:  Invalid multichar encoding mode \"%s\"",
 		    file_peek_path(), file_peek_line(), rs_multichar_encoding);
 	return;
       }
-      set_multichar_encoding(rs_multichar_encoding);
     } else {
       print_error("Parse error in file %s, line %lu:  Invalid parameter list \"\" for attribute encoding",
 		  file_peek_path(), file_peek_line());
@@@@ -3248,6 +3249,9 @@@@
       }
     }
 #ifdef MULTI_CHARSET
+    if (rs_multichar_encoding) {
+      set_multichar_encoding(rs_multichar_encoding);
+    }
     if (rs_mfont[i]) {
       if (def_font_idx == 0) {
         eterm_font_add(&etmfonts, rs_mfont[i], i);
@


1.1
log
@Initial version.

Eterm is a color vt102 terminal emulator for X Window system.
It supports pixmap and pseudo-transparent background. It also
supports Japanese input with XIM (X Input Method) protocol.

This version also adds BIG5 and GB support.

Thanks to MANTANI Nobutaka <nobutaka@@nobutaka.com> for the patch.

Submitted by:	Michael C. Wu <keichii@@iteration.net>
@
text
@@

