merges r32252 from trunk into ruby_1_9_2.

--
 * lib/irb/workspace.rb: fix BUG#4793.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@32911 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 11905f9f97..d693999284 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jun 28 00:08:43 2011  Keiju Ishitsuka  <keiju@ishitsuka.com>
+
+	* lib/irb/workspace.rb: fix BUG#4793.
+
 Mon Jun 27 01:34:18 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* test/etc/test_etc.rb (TestEtc#test_get{pw,gr}nam): skip entries
diff --git a/lib/irb/workspace.rb b/lib/irb/workspace.rb
index 991df2e652..edc0d3b147 100644
--- a/lib/irb/workspace.rb
+++ b/lib/irb/workspace.rb
@@ -97,7 +97,7 @@ EOF
       when 3
 	return nil if bt =~ /irb\/.*\.rb/
 	return nil if bt =~ /irb\.rb/
-	bt.sub!(/:\s*in `irb_binding'/, '')
+	bt = bt.sub(/:\s*in `irb_binding'/, '')
       end
       bt
     end
diff --git a/version.h b/version.h
index 3d123d4f5d..6653879760 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 296
+#define RUBY_PATCHLEVEL 297
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1