nagachika	2013-04-16 22:49:52 +0900 (Tue, 16 Apr 2013)

  New Revision: 40323

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

  Log:
    merge revision(s) 40318:
    
    fixed wrong value by @taksatou [fix GH-287]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ext/pty/lib/expect.rb
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ext/pty/lib/expect.rb
===================================================================
--- ruby_2_0_0/ext/pty/lib/expect.rb	(revision 40322)
+++ ruby_2_0_0/ext/pty/lib/expect.rb	(revision 40323)
@@ -37,7 +37,7 @@ class IO https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/pty/lib/expect.rb#L37
     when Regexp
       e_pat = pat
     else
-      raise TypeError, "unsupported pattern class: #{pattern.class}"
+      raise TypeError, "unsupported pattern class: #{pat.class}"
     end
     @unusedBuf ||= ''
     while true
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 40322)
+++ ruby_2_0_0/version.h	(revision 40323)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-04-16"
-#define RUBY_PATCHLEVEL 141
+#define RUBY_PATCHLEVEL 142
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 4

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r40318


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