yugui	2010-12-02 17:07:36 +0900 (Thu, 02 Dec 2010)

  New Revision: 30048

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30048

  Log:
    merges r29517 from trunk into ruby_1_9_2.
    --
    * ext/win32ole/win32ole.c (ole_encoding2cp): set codepage 20936
      according to GB2312. [Bug #3937] [ruby-core:32758]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/ext/win32ole/win32ole.c
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 30047)
+++ ruby_1_9_2/ChangeLog	(revision 30048)
@@ -1,3 +1,8 @@
+Sat Oct 16 11:10:55 2010  Masaki Suketa <masaki.suketa@n...>
+
+	* ext/win32ole/win32ole.c (ole_encoding2cp): set codepage 20936
+	  according to GB2312. [Bug #3937] [ruby-core:32758]
+
 Fri Oct 15 23:36:25 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* file.c (NUM2DEVT, DEVT2NUM, PRI_DEVT_PREFIX): fallback to
Index: ruby_1_9_2/ext/win32ole/win32ole.c
===================================================================
--- ruby_1_9_2/ext/win32ole/win32ole.c	(revision 30047)
+++ ruby_1_9_2/ext/win32ole/win32ole.c	(revision 30048)
@@ -868,7 +868,7 @@
     ENC_MACHING_CP(enc, "EUC-KR", 51949);
     ENC_MACHING_CP(enc, "EUC-TW", 51950);
     ENC_MACHING_CP(enc, "GB18030", 54936);
-    ENC_MACHING_CP(enc, "GB2312", 51936);
+    ENC_MACHING_CP(enc, "GB2312", 20936);
     ENC_MACHING_CP(enc, "GBK", 936);
     ENC_MACHING_CP(enc, "IBM437", 437);
     ENC_MACHING_CP(enc, "IBM737", 737);
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 30047)
+++ ruby_1_9_2/version.h	(revision 30048)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 78
+#define RUBY_PATCHLEVEL 79
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/