diff options
author | keiju <keiju@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-08-26 05:36:23 +0000 |
---|---|---|
committer | keiju <keiju@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-08-26 05:36:23 +0000 |
commit | 317948160bc929cd73a323d0eac33c8df896eb41 (patch) | |
tree | 7cbd648c5cbbe88867918969206a8c332289ffe6 /lib | |
parent | a5df717c8ee7554b0b18d2ad50f49b6b2aadcdd4 (diff) | |
download | ruby-317948160bc929cd73a323d0eac33c8df896eb41.tar.gz |
* 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@9031 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r-- | lib/irb/init.rb | 12 | ||||
-rw-r--r-- | lib/irb/locale.rb | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/lib/irb/init.rb b/lib/irb/init.rb index bc8f9b599b..00b7f1bd6e 100644 --- a/lib/irb/init.rb +++ b/lib/irb/init.rb @@ -121,8 +121,12 @@ module IRB @CONF[:LC_MESSAGES].load("irb/error.rb") end + FEATUER_IOPT_CHANGE_VERSION = "1.9.0" + FEATUER_IOPT_CHANGE_DATE = "2005-04-22" + # option analyzing def IRB.parse_opts + load_path = [] while opt = ARGV.shift case opt when "-f" @@ -136,7 +140,7 @@ module IRB @CONF[:LOAD_MODULES].push opt if opt when /^-I(.+)?/ opt = $1 || ARGV.shift - $LOAD_PATH.push opt if opt + load_path.push opt if opt when /^-K(.)/ $KCODE = $1 when "--inspect" @@ -189,6 +193,12 @@ 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)} + end + $LOAD_PATH.unshift(*load_path) end # running config diff --git a/lib/irb/locale.rb b/lib/irb/locale.rb index ddd2187680..4b6aba2bb9 100644 --- a/lib/irb/locale.rb +++ b/lib/irb/locale.rb @@ -31,6 +31,8 @@ module IRB Kconv::EUC when "ja_JP.sjis", "ja_JP.SJIS" Kconv::SJIS + when /ja_JP.utf-?8/i + Kconv::UTF8 end end private :lc2kconv |