yugui	2011-08-11 09:37:54 +0900 (Thu, 11 Aug 2011)

  New Revision: 32911

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

  Log:
    merges r32252 from trunk into ruby_1_9_2.
    --
     * lib/irb/workspace.rb: fix BUG#4793.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/lib/irb/workspace.rb
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 32910)
+++ ruby_1_9_2/ChangeLog	(revision 32911)
@@ -1,3 +1,7 @@
+Tue Jun 28 00:08:43 2011  Keiju Ishitsuka  <keiju@i...>
+
+	* lib/irb/workspace.rb: fix BUG#4793.
+
 Mon Jun 27 01:34:18 2011  Nobuyoshi Nakada  <nobu@r...>
 
 	* test/etc/test_etc.rb (TestEtc#test_get{pw,gr}nam): skip entries
Index: ruby_1_9_2/lib/irb/workspace.rb
===================================================================
--- ruby_1_9_2/lib/irb/workspace.rb	(revision 32910)
+++ ruby_1_9_2/lib/irb/workspace.rb	(revision 32911)
@@ -97,7 +97,7 @@
       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
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 32910)
+++ ruby_1_9_2/version.h	(revision 32911)
@@ -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

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