yugui	2010-12-23 19:49:20 +0900 (Thu, 23 Dec 2010)

  New Revision: 30310

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

  Log:
    merges r30085 from trunk into ruby_1_9_2.
    --
    * lib/irb/init.rb (IRB.parse_opts): fix typo. [ruby-core:33574]

  Added directories:
    branches/ruby_1_9_2/test/irb/
  Added files:
    branches/ruby_1_9_2/test/irb/test_option.rb
  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/lib/irb/init.rb
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 30309)
+++ ruby_1_9_2/ChangeLog	(revision 30310)
@@ -1,3 +1,7 @@
+Sun Dec  5 12:09:27 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/irb/init.rb (IRB.parse_opts): fix typo. [ruby-core:33574]
+
 Sun Dec  5 11:27:08 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* ruby.c (load_file_internal): decrement for ungotten line.
Index: ruby_1_9_2/lib/irb/init.rb
===================================================================
--- ruby_1_9_2/lib/irb/init.rb	(revision 30309)
+++ ruby_1_9_2/lib/irb/init.rb	(revision 30310)
@@ -207,7 +207,7 @@
 	IRB.print_usage
 	exit 0
       when "--"
-	if opt = ARGV.shfit
+	if opt = ARGV.shift
 	  @CONF[:SCRIPT] = opt
 	  $0 = opt
 	end
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 30309)
+++ ruby_1_9_2/version.h	(revision 30310)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 115
+#define RUBY_PATCHLEVEL 116
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
Index: ruby_1_9_2/test/irb/test_option.rb
===================================================================
--- ruby_1_9_2/test/irb/test_option.rb	(revision 0)
+++ ruby_1_9_2/test/irb/test_option.rb	(revision 30310)
@@ -0,0 +1,12 @@
+require 'test/unit'
+require_relative '../ruby/envutil'
+
+module TestIRB
+  class TestOption < Test::Unit::TestCase
+    def test_end_of_option
+      bug4117 = '[ruby-core:33574]'
+      status = assert_in_out_err(%w[-rirb -e IRB.start(__FILE__) -- --], "", //, [], bug4117)
+      assert(status.success?, bug4117)
+    end
+  end
+end

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