yugui	2009-08-09 00:34:14 +0900 (Sun, 09 Aug 2009)

  New Revision: 24468

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

  Log:
    merges r24404 from trunk into ruby_1_9_1.
    --
    * bootstraptest/test_exception.rb: test for [ruby-core:24767].

  Modified files:
    branches/ruby_1_9_1/bootstraptest/test_exception.rb
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/bootstraptest/test_exception.rb
===================================================================
--- ruby_1_9_1/bootstraptest/test_exception.rb	(revision 24467)
+++ ruby_1_9_1/bootstraptest/test_exception.rb	(revision 24468)
@@ -370,7 +370,7 @@
 }
 
 ##
-assert_match /undefined method `foo\'/, %q{
+assert_match /undefined method `foo\'/, %q{#`
   STDERR.reopen(STDOUT)
   class C
     def inspect
@@ -402,3 +402,15 @@
   exc.inspect
 }, '[ruby-dev:32608]'
 
+assert_equal 'exception class/object expected', %q{
+  class ZeroDivisionError
+    def self.new(message)
+      42
+    end
+  end
+  begin
+    1/0
+  rescue Exception => e
+    e.message
+  end
+}, '[ruby-core:24767]'
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 24467)
+++ ruby_1_9_1/version.h	(revision 24468)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 272
+#define RUBY_PATCHLEVEL 273
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

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