summaryrefslogtreecommitdiff
path: root/lib/irb/init.rb
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-01-16 22:09:29 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-01-16 22:09:29 +0000
commitdc4d23a7e54df022cdd956c26ee3f8fb5e25c5c9 (patch)
tree0b9c55bfd6719644c35c3acac6a42556542b84d1 /lib/irb/init.rb
parenta5f31f564338ff1b0c3b87f6ea8aadfff763af44 (diff)
* 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/branches/ruby_1_8@7781 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/irb/init.rb')
-rw-r--r--lib/irb/init.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/irb/init.rb b/lib/irb/init.rb
index 37cdb313e6..ea206c9da5 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