mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* lib/irb/init.rb: make IRB -I option that is same befavior for ruby.
[ruby-dev:26872] * lib/irb/locale.rb: support to print help message when OS locale is ja_JP.utf-8. [ruby-dev:26872] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9040 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
cd7cc246d2
commit
6f23ba054a
2 changed files with 14 additions and 7 deletions
|
@ -1,3 +1,10 @@
|
|||
Mon Aug 29 18:58:05 2005 Keiju Ishitsuka <keiju@ruby-lang.org>
|
||||
* lib/irb/init.rb: make IRB -I option that is same befavior for ruby.
|
||||
[ruby-dev:26872]
|
||||
|
||||
* lib/irb/locale.rb: support to print help message when OS locale is
|
||||
ja_JP.utf-8. [ruby-dev:26872]
|
||||
|
||||
Mon Aug 29 01:43:05 2005 Tanaka Akira <akr@m17n.org>
|
||||
|
||||
* lib/pathname.rb (Pathname#descend): new method.
|
||||
|
@ -20,6 +27,7 @@ Sat Aug 27 20:13:31 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
|
|||
|
||||
* ext/curses/view.rb: String =~ String is deprecated.
|
||||
|
||||
>>>>>>> 1.4509
|
||||
Thu Aug 25 15:48:58 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
|
||||
|
||||
* ext/win32ole/win32ole.c: supress warnings. (win32)
|
||||
|
|
|
@ -121,8 +121,7 @@ module IRB
|
|||
@CONF[:LC_MESSAGES].load("irb/error.rb")
|
||||
end
|
||||
|
||||
FEATUER_IOPT_CHANGE_VERSION = "1.9.0"
|
||||
FEATUER_IOPT_CHANGE_DATE = "2005-04-22"
|
||||
FEATURE_IOPT_CHANGE_VERSION = "1.9.0"
|
||||
|
||||
# option analyzing
|
||||
def IRB.parse_opts
|
||||
|
@ -140,7 +139,7 @@ module IRB
|
|||
@CONF[:LOAD_MODULES].push opt if opt
|
||||
when /^-I(.+)?/
|
||||
opt = $1 || ARGV.shift
|
||||
load_path.push opt if opt
|
||||
load_path.concat(opt.split(File::PATH_SEPARATOR)) if opt
|
||||
when /^-K(.)/
|
||||
$KCODE = $1
|
||||
when "--inspect"
|
||||
|
@ -193,10 +192,10 @@ module IRB
|
|||
break
|
||||
end
|
||||
end
|
||||
if RUBY_VERSION > FEATUER_IOPT_CHANGE_VERSION ||
|
||||
RUBY_VERSION == FEATUER_IOPT_CHANGE_VERSION &&
|
||||
RUBY_RELEASE_DATE >= FEATUER_IOPT_CHANGE_DATE
|
||||
load_path = load_path.collect{|p| File.expand_path(p)}
|
||||
if RUBY_VERSION >= FEATURE_IOPT_CHANGE_VERSION
|
||||
load_path.collect do |path|
|
||||
/\A\.\// =~ path ? path : File.expand_path(path)
|
||||
end
|
||||
end
|
||||
$LOAD_PATH.unshift(*load_path)
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue