From 4ef1f3eafe471c38aa4f748478c480dcfc5000b7 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 8 Aug 2009 15:34:14 +0000
Subject: [PATCH] merges r24404 from trunk into ruby_1_9_1. -- *
 bootstraptest/test_exception.rb: test for [ruby-core:24767].

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@24468 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 bootstraptest/test_exception.rb | 14 +++++++++++++-
 version.h                       |  2 +-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/bootstraptest/test_exception.rb b/bootstraptest/test_exception.rb
index bd3d02ade3..33154a546d 100644
--- a/bootstraptest/test_exception.rb
+++ b/bootstraptest/test_exception.rb
@@ -370,7 +370,7 @@ assert_equal %q{}, %q{
 }
 
 ##
-assert_match /undefined method `foo\'/, %q{
+assert_match /undefined method `foo\'/, %q{#`
   STDERR.reopen(STDOUT)
   class C
     def inspect
@@ -402,3 +402,15 @@ assert_equal 'nil', %q{
   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]'
diff --git a/version.h b/version.h
index 1fdfd6999e..e2395aedf1 100644
--- a/version.h
+++ b/version.h
@@ -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