ruby-changes:38547
From: nagachika <ko1@a...>
Date: Sun, 24 May 2015 03:39:40 +0900 (JST)
Subject: [ruby-changes:38547] nagachika:r50628 (ruby_2_2): merge revision(s) 50509: [Backport #11132]
nagachika 2015-05-24 03:39:11 +0900 (Sun, 24 May 2015) New Revision: 50628 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=50628 Log: merge revision(s) 50509: [Backport #11132] * string.c: added documentation for character sequence \' with String#sub [Bug #11132][ruby-core:69121][fix GH-900][ci skip] Patch by @shishir127 Modified directories: branches/ruby_2_2/ Modified files: branches/ruby_2_2/ChangeLog branches/ruby_2_2/string.c branches/ruby_2_2/version.h Index: ruby_2_2/ChangeLog =================================================================== --- ruby_2_2/ChangeLog (revision 50627) +++ ruby_2_2/ChangeLog (revision 50628) @@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1 +Sun May 24 03:37:14 2015 SHIBATA Hiroshi <hsbt@r...> + + * string.c: added documentation for character sequence \' with String#sub + [Bug #11132][ruby-core:69121][fix GH-900][ci skip] Patch by @shishir127 + Sun May 24 03:32:53 2015 SHIBATA Hiroshi <hsbt@r...> * rational.c: Added documentation for rational literal. Index: ruby_2_2/string.c =================================================================== --- ruby_2_2/string.c (revision 50627) +++ ruby_2_2/string.c (revision 50628) @@ -4226,6 +4226,9 @@ rb_str_sub_bang(int argc, VALUE *argv, V https://github.com/ruby/ruby/blob/trunk/ruby_2_2/string.c#L4226 * double-quoted string, both back-references must be preceded by an * additional backslash. However, within +replacement+ the special match * variables, such as <code>&$</code>, will not refer to the current match. + * If +replacement+ is a String that looks like a pattern's capture group but + * is actaully not a pattern capture group e.g. <code>"\\'"</code>, then it + * will have to be preceded by two backslashes like so <code>"\\\\'"</code>. * * If the second argument is a Hash, and the matched text is one of its keys, * the corresponding value is the replacement string. Index: ruby_2_2/version.h =================================================================== --- ruby_2_2/version.h (revision 50627) +++ ruby_2_2/version.h (revision 50628) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1 #define RUBY_VERSION "2.2.3" #define RUBY_RELEASE_DATE "2015-05-24" -#define RUBY_PATCHLEVEL 124 +#define RUBY_PATCHLEVEL 125 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 5 Property changes on: ruby_2_2 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r50509 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/