nagachika	2013-04-15 00:13:32 +0900 (Mon, 15 Apr 2013)

  New Revision: 40293

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

  Log:
    merge revision(s) 40003: [Backport #7996]
    
    * win32/file.c (code_page): use cp1252 instead of cp20127 as US-ASCII.
      fix [ruby-core:53079] [Bug #7996]
      reported and patched by mmeltner (Michael Meltner).
      reported by mitchellh (Mitchell Hashimoto).

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/version.h
    branches/ruby_2_0_0/win32/file.c

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 40292)
+++ ruby_2_0_0/ChangeLog	(revision 40293)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Mon Apr 15 00:13:13 2013  NAKAMURA Usaku  <usa@r...>
+
+	* win32/file.c (code_page): use cp1252 instead of cp20127 as US-ASCII.
+	  fix [ruby-core:53079] [Bug #7996]
+	  reported and patched by mmeltner (Michael Meltner).
+
 Mon Apr 15 00:07:31 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* include/ruby/io.h: undef POSIX compliant names on AIX, which are no
Index: ruby_2_0_0/win32/file.c
===================================================================
--- ruby_2_0_0/win32/file.c	(revision 40292)
+++ ruby_2_0_0/win32/file.c	(revision 40293)
@@ -212,9 +212,9 @@ code_page(rb_encoding *enc) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/win32/file.c#L212
 	names_ary = rb_funcall(encoding, names, 0);
     }
 
-    /* map US-ASCII and ASCII-8bit as code page 20127 (us-ascii) */
+    /* map US-ASCII and ASCII-8bit as code page 1252 (us-ascii) */
     if (enc == rb_usascii_encoding() || enc == rb_ascii8bit_encoding()) {
-	UINT code_page = 20127;
+	UINT code_page = 1252;
 	rb_hash_aset(rb_code_page, name_key, INT2FIX(code_page));
 	return code_page;
     }
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 40292)
+++ ruby_2_0_0/version.h	(revision 40293)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-04-15"
-#define RUBY_PATCHLEVEL 128
+#define RUBY_PATCHLEVEL 129
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 4

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r40003


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