From 9603e288446876c5a9f94f08ad8c123a3344c38f Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 10 Mar 2004 08:21:07 +0000
Subject: * eval.c (return_jump): set return value to the return   destination.
  separated from localjump_destination().

* eval.c (break_jump): break innermost loop (or thread or proc).

* eval.c (rb_yield_0): set exit_value for block break.

* eval.c (eval): Only print backtrace if generating the backtrace
  doesn't generate an exception.  [ruby-core:02621]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@5936 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/irb/completion.rb      | 2 +-
 lib/irb/init.rb            | 3 +++
 lib/irb/lc/help-message    | 1 +
 lib/irb/lc/ja/help-message | 1 +
 4 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'lib/irb')

diff --git a/lib/irb/completion.rb b/lib/irb/completion.rb
index 46e6f24f30..e51a92adc1 100644
--- a/lib/irb/completion.rb
+++ b/lib/irb/completion.rb
@@ -182,7 +182,7 @@ module IRB
 end
 
 if Readline.respond_to?("basic_word_break_characters=")
-  Readline.basic_word_break_characters= "\t\n\"\\'`><=;|&{("
+  Readline.basic_word_break_characters= " \t\n\"\\'`><=;|&{("
 end
 Readline.completion_append_character = nil
 Readline.completion_proc = IRB::InputCompletor::CompletionProc
diff --git a/lib/irb/init.rb b/lib/irb/init.rb
index 9fd86e94a2..37cdb313e6 100644
--- a/lib/irb/init.rb
+++ b/lib/irb/init.rb
@@ -126,6 +126,9 @@ module IRB
       when "-r"
 	opt = ARGV.shift
 	@CONF[:LOAD_MODULES].push opt if opt
+      when "-I"
+        opt = ARGV.shift
+        $LOAD_PATH.push opt if opt
       when /^-K(.)/
 	$KCODE = $1
       when "--inspect"
diff --git a/lib/irb/lc/help-message b/lib/irb/lc/help-message
index 42e861a343..efc00bf148 100644
--- a/lib/irb/lc/help-message
+++ b/lib/irb/lc/help-message
@@ -14,6 +14,7 @@ Usage:  irb.rb [options] [programfile] [arguments]
   -m		    Bc mode (load mathn, fraction or matrix are available)
   -d                Set $DEBUG to true (same as `ruby -d')
   -r load-module    Same as `ruby -r'
+  -I path           Specify $LOAD_PATH directory
   --inspect	    Use `inspect' for output (default except for bc mode)
   --noinspect	    Don't use inspect for output
   --readline	    Use Readline extension module
diff --git a/lib/irb/lc/ja/help-message b/lib/irb/lc/ja/help-message
index 1cf980f6ba..4b710c7788 100644
--- a/lib/irb/lc/ja/help-message
+++ b/lib/irb/lc/ja/help-message
@@ -14,6 +14,7 @@ Usage:  irb.rb [options] [programfile] [arguments]
   -m		    bcモード(分数, 行列の計算ができる)
   -d                $DEBUG をtrueにする(ruby -d と同じ)
   -r load-module    ruby -r と同じ.
+  -I path           $LOAD_PATH に path を追加する.
   --inspect	    結果出力にinspectを用いる(bcモード以外はデフォルト). 
   --noinspect	    結果出力にinspectを用いない.
   --readline	    readlineライブラリを利用する.
-- 
cgit v1.2.3