archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 17:43:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merges r30085 from trunk into ruby_1_9_2.

Browse source 
--
* lib/irb/init.rb (IRB.parse_opts): fix typo. [ruby-core:33574]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30310 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2010-12-23 10:49:20 +00:00
parent 9afa601a90
commit 06dc853ab8
4 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Sun Dec 5 12:09:27 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/irb/init.rb (IRB.parse_opts): fix typo. [ruby-core:33574]
Sun Dec 5 11:27:08 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> Sun Dec 5 11:27:08 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ruby.c (load_file_internal): decrement for ungotten line. * ruby.c (load_file_internal): decrement for ungotten line.

2
lib/irb/init.rb
View file

@ -207,7 +207,7 @@ module IRB
IRB.print_usage IRB.print_usage
exit 0 exit 0
when "--" when "--"
if opt = ARGV.shfit if opt = ARGV.shift
@CONF[:SCRIPT] = opt @CONF[:SCRIPT] = opt
$0 = opt $0 = opt
end end

12
test/irb/test_option.rb Normal file
View file

@ -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

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2" #define RUBY_VERSION "1.9.2"
#define RUBY_PATCHLEVEL 115 #define RUBY_PATCHLEVEL 116
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1