usa	2012-10-13 01:41:34 +0900 (Sat, 13 Oct 2012)

  New Revision: 37172

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

  Log:
    merge revision(s) 37171:
    
    * test/ruby/test_regexp.rb
      (TestRegexp#test_raw_hyphen_and_type_char_after_range): added new
      test. ref [ruby-core:47115] [Backport #6853]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/test/ruby/test_regexp.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 37171)
+++ ruby_1_9_3/ChangeLog	(revision 37172)
@@ -1,3 +1,9 @@
+Sat Oct 13 01:39:46 2012  NAKAMURA Usaku  <usa@r...>
+
+	* test/ruby/test_regexp.rb
+	  (TestRegexp#test_raw_hyphen_and_type_char_after_range): added new
+	  test. ref [ruby-core:47115] [Backport #6853]
+
 Fri Oct 12 18:19:35 2012  Nobuyoshi Nakada  <nobu@r...>
 
 	* file.c (rb_get_path_check): path name must not contain NUL bytes.
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 37171)
+++ ruby_1_9_3/version.h	(revision 37172)
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 286
+#define RUBY_PATCHLEVEL 287
 
-#define RUBY_RELEASE_DATE "2012-10-12"
+#define RUBY_RELEASE_DATE "2012-10-13"
 #define RUBY_RELEASE_YEAR 2012
 #define RUBY_RELEASE_MONTH 10
-#define RUBY_RELEASE_DAY 12
+#define RUBY_RELEASE_DAY 13
 
 #include "ruby/version.h"
 
Index: ruby_1_9_3/test/ruby/test_regexp.rb
===================================================================
--- ruby_1_9_3/test/ruby/test_regexp.rb	(revision 37171)
+++ ruby_1_9_3/test/ruby/test_regexp.rb	(revision 37172)
@@ -867,4 +867,14 @@
     assert_match(/invalid hex escape/, error.message)
     assert_equal(1, error.message.scan(/.*invalid .*escape.*/i).size, bug3539)
   end
+
+  def test_raw_hyphen_and_type_char_after_range
+    bug6853 = '[ruby-core:47115]'
+    begin
+      verbose, $VERBOSE = $VERBOSE, nil
+      assert_match(/[0-1-\s]/, ' ', bug6853)
+    ensure
+      $VERBOSE = verbose
+    end
+  end
 end

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