diff --git a/ChangeLog b/ChangeLog index 1dce588f2e..79584684e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Fri Aug 8 16:40:59 2014 SHIBATA Hiroshi + + * lib/irb/init.rb: removed unreachable code. + Fri Aug 8 16:34:22 2014 SHIBATA Hiroshi * lib/drb/drb.rb: removed unreachable code. diff --git a/lib/irb/init.rb b/lib/irb/init.rb index 826bcaf3ac..5cac222d85 100644 --- a/lib/irb/init.rb +++ b/lib/irb/init.rb @@ -122,8 +122,6 @@ module IRB # :nodoc: @CONF[:LC_MESSAGES].load("irb/error.rb") end - FEATURE_IOPT_CHANGE_VERSION = "1.9.0" - # option analyzing def IRB.parse_opts load_path = [] @@ -220,10 +218,8 @@ module IRB # :nodoc: break end end - if RUBY_VERSION >= FEATURE_IOPT_CHANGE_VERSION - load_path.collect! do |path| - /\A\.\// =~ path ? path : File.expand_path(path) - end + load_path.collect! do |path| + /\A\.\// =~ path ? path : File.expand_path(path) end $LOAD_PATH.unshift(*load_path)