* lib/irb/init.rb: make IRB -I option that is same befavior for ruby.

 [ruby-dev:26872], [ruby-dev: 26920]

* lib/irb/locale.rb: support to print help message when OS locale is
 ja_JP.utf-8. [ruby-dev:26872]


git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 12 insertions, 1 deletions

diff --git a/lib/irb/init.rb b/lib/irb/init.rb
index bc8f9b599..842eb1221 100644
--- a/lib/irb/init.rb
+++ b/lib/irb/init.rb
@@ -121,8 +121,11 @@ module IRB
     @CONF[:LC_MESSAGES].load("irb/error.rb")
   end
 
+  FEATURE_IOPT_CHANGE_VERSION = "1.9.0"
+
   # option analyzing
   def IRB.parse_opts
+    load_path = []
     while opt = ARGV.shift
       case opt
       when "-f"
@@ -136,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"
@@ -189,6 +192,12 @@ module IRB
 	break
       end
     end
+    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
 
   # running config
diff --git a/lib/irb/locale.rb b/lib/irb/locale.rb
index ddd218768..4b6aba2bb 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