nagachika	2016-04-23 00:26:53 +0900 (Sat, 23 Apr 2016)

  New Revision: 54712

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=54712

  Log:
    merge revision(s) 53315: [Backport #11872]
    
    * miniinit.c (Init_enc): add some common aliases of built-in
      encodings.  [ruby-core:72481] [Bug #11872]

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/ChangeLog
    branches/ruby_2_3/miniinit.c
    branches/ruby_2_3/version.h
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 54711)
+++ ruby_2_3/version.h	(revision 54712)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #define RUBY_VERSION "2.3.0"
 #define RUBY_RELEASE_DATE "2016-04-23"
-#define RUBY_PATCHLEVEL 101
+#define RUBY_PATCHLEVEL 102
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 4
Index: ruby_2_3/miniinit.c
===================================================================
--- ruby_2_3/miniinit.c	(revision 54711)
+++ ruby_2_3/miniinit.c	(revision 54712)
@@ -36,11 +36,14 @@ Init_enc_set_filesystem_encoding(void) https://github.com/ruby/ruby/blob/trunk/ruby_2_3/miniinit.c#L36
     return rb_enc_to_index(rb_default_external_encoding());
 }
 
+void rb_encdb_declare(const char *name);
+int rb_encdb_alias(const char *alias, const char *orig);
 void
 Init_enc(void)
 {
-    void rb_encdb_declare(const char *name);
     rb_encdb_declare("ASCII-8BIT");
     rb_encdb_declare("US-ASCII");
     rb_encdb_declare("UTF-8");
+    rb_encdb_alias("BINARY", "ASCII-8BIT");
+    rb_encdb_alias("ASCII", "US-ASCII");
 }
Index: ruby_2_3/ChangeLog
===================================================================
--- ruby_2_3/ChangeLog	(revision 54711)
+++ ruby_2_3/ChangeLog	(revision 54712)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1
+Sat Apr 23 00:25:26 2016  Nobuyoshi Nakada  <nobu@r...>
+
+	* miniinit.c (Init_enc): add some common aliases of built-in
+	  encodings.  [ruby-core:72481] [Bug #11872]
+
 Sat Apr 23 00:13:50 2016  sorah (Shota Fukumori)  <her@s...>
 
 	* lib/forwardable.rb: Convert given accessors to String.

Property changes on: ruby_2_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r53315


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