usa	2016-02-25 20:00:43 +0900 (Thu, 25 Feb 2016)

  New Revision: 53937

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

  Log:
    merge revision(s) 53784: [Backport #11495]
    
    * re.c: Remove deprecated kcode argument from Regexp.new and compile
      patch provided by Dylan Pulliam [Bug #11495]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/re.c
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 53936)
+++ ruby_2_1/ChangeLog	(revision 53937)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Thu Feb 25 19:58:48 2016  Zachary Scott  <zzak@r...>
+
+	* re.c: Remove deprecated kcode argument from Regexp.new and compile
+	  patch provided by Dylan Pulliam [Bug #11495]
+
 Thu Feb 25 19:49:31 2016  Nobuyoshi Nakada  <nobu@r...>
 
 	* ext/socket/socket.c (sock_gethostname): support unlimited size
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 53936)
+++ ruby_2_1/version.h	(revision 53937)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.9"
 #define RUBY_RELEASE_DATE "2016-02-25"
-#define RUBY_PATCHLEVEL 455
+#define RUBY_PATCHLEVEL 456
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 2
Index: ruby_2_1/re.c
===================================================================
--- ruby_2_1/re.c	(revision 53936)
+++ ruby_2_1/re.c	(revision 53937)
@@ -2935,10 +2935,10 @@ rb_reg_match_m(int argc, VALUE *argv, VA https://github.com/ruby/ruby/blob/trunk/ruby_2_1/re.c#L2935
 
 /*
  *  call-seq:
- *     Regexp.new(string, [options [, kcode]])        -> regexp
- *     Regexp.new(regexp)                            -> regexp
- *     Regexp.compile(string, [options [, kcode]])    -> regexp
- *     Regexp.compile(regexp)                        -> regexp
+ *     Regexp.new(string, [options])       -> regexp
+ *     Regexp.new(regexp)                  -> regexp
+ *     Regexp.compile(string, [options)    -> regexp
+ *     Regexp.compile(regexp)              -> regexp
  *
  *  Constructs a new regular expression from +pattern+, which can be either a
  *  String or a Regexp (in which case that regexp's options are propagated),
@@ -2949,9 +2949,6 @@ rb_reg_match_m(int argc, VALUE *argv, VA https://github.com/ruby/ruby/blob/trunk/ruby_2_1/re.c#L2949
  *  <em>or</em>-ed together.  Otherwise, if +options+ is not
  *  +nil+ or +false+, the regexp will be case insensitive.
  *
- *  When the +kcode+ parameter is `n' or `N' sets the regexp no encoding.
- *  It means that the regexp is for binary strings.
- *
  *    r1 = Regexp.new('^a-z+:\\s+\w+') #=> /^a-z+:\s+\w+/
  *    r2 = Regexp.new('cat', true)     #=> /cat/i
  *    r3 = Regexp.new(r2)              #=> /cat/i

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r53784


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