nobu	2012-02-14 15:07:39 +0900 (Tue, 14 Feb 2012)

  New Revision: 34590

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

  Log:
    merge revision(s) 34589:
    
    * lib/test/unit/assertions.rb (build_message): skip escaped
      question marks.

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/lib/test/unit/assertions.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34589)
+++ ruby_1_9_3/ChangeLog	(revision 34590)
@@ -1,3 +1,8 @@
+Tue Feb 14 15:07:23 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/test/unit/assertions.rb (build_message): skip escaped
+	  question marks.
+
 Mon Feb 13 12:06:29 2012  Loren Segal  <lsegal@s...>
 
 	* io.c (Init_IO): use directive hack to make ARGF documentable
Index: ruby_1_9_3/lib/test/unit/assertions.rb
===================================================================
--- ruby_1_9_3/lib/test/unit/assertions.rb	(revision 34589)
+++ ruby_1_9_3/lib/test/unit/assertions.rb	(revision 34590)
@@ -265,7 +265,7 @@
 
       def build_message(head, template=nil, *arguments) #:nodoc:
         template &&= template.chomp
-        template.gsub(/\?/) { mu_pp(arguments.shift) }
+        template.gsub(/\G((?:[^\\]|\\.)*?)(\\)?\?/) { $1 + ($2 ? "?" : mu_pp(arguments.shift)) }
       end
     end
   end
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34589)
+++ ruby_1_9_3/version.h	(revision 34590)
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 105
+#define RUBY_PATCHLEVEL 106
 
-#define RUBY_RELEASE_DATE "2012-02-13"
+#define RUBY_RELEASE_DATE "2012-02-14"
 #define RUBY_RELEASE_YEAR 2012
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 13
+#define RUBY_RELEASE_DAY 14
 
 #include "ruby/version.h"
 

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