From 4d2f38b7778cd51cdf1e877d61dbb1ad2b028557 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 16 Jan 2005 22:09:29 +0000
Subject: * ext/readline/readline.c: suppress warnings.

* lib/irb/extend-command.rb (IRB::ContextExtender.def_extend_command):
  ditto.

* lib/irb/ext/history.rb (IRB::Context::set_last_value): ditto.

* lib/irb/ext/history.rb (IRB::Context::eval_history): ditto.

* lib/irb/locale.rb (IRB::Locale::real_load): ditto.

* lib/irb/slex.rb (SLex::Node::create_subnode): remove garbage.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7781 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/irb/init.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'lib/irb/init.rb')

diff --git a/lib/irb/init.rb b/lib/irb/init.rb
index 8b6ff6264d..ad53a303f8 100644
--- a/lib/irb/init.rb
+++ b/lib/irb/init.rb
@@ -97,7 +97,7 @@ module IRB
       }
     }
 
-    @CONF[:PROMPT_MODE] = :DEFAULT
+    @CONF[:PROMPT_MODE] = (STDIN.tty? ? :DEFAULT : :NULL)
     @CONF[:AUTO_INDENT] = false
 
     @CONF[:CONTEXT_MODE] = 3 # use binding in function on TOPLEVEL_BINDING
@@ -123,11 +123,11 @@ module IRB
 	@CONF[:MATH_MODE] = true
       when "-d"
 	$DEBUG = true
-      when "-r"
-	opt = ARGV.shift
+      when /^-r(.+)?/
+	opt = $1 || ARGV.shift
 	@CONF[:LOAD_MODULES].push opt if opt
-      when "-I"
-        opt = ARGV.shift
+      when /^-I(.+)?/
+        opt = $1 || ARGV.shift
         $LOAD_PATH.push opt if opt
       when /^-K(.)/
 	$KCODE = $1
-- 
cgit v1.2.3