summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-11-11 08:41:29 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-11-11 08:41:29 +0000
commit7be0d2c591b6f6aea8f4a3a9293086e72dcf3431 (patch)
tree8eace2d87d09691f854accf648ac951505128f27
parent78eef5d8492f45b144532bd3039ed5347b3e04be (diff)
downloadruby-7be0d2c591b6f6aea8f4a3a9293086e72dcf3431.tar.gz
ruby-7be0d2c591b6f6aea8f4a3a9293086e72dcf3431.tar.xz
ruby-7be0d2c591b6f6aea8f4a3a9293086e72dcf3431.zip
merges r20128 from trunk into ruby_1_9_1.
* lib/irb.rb (IRB::Irb#eval_input): remove extra @context.prompt_i. [ruby-core:19718] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20186 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/irb.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index fd41a95f6..6dbf37f0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Nov 7 12:26:00 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * lib/irb.rb (IRB::Irb#eval_input): remove extra @context.prompt_i.
+ [ruby-core:19718]
+
Fri Nov 7 11:55:30 2008 NARUSE, Yui <naruse@ruby-lang.org>
* nkf.c: update to r1.188. fixes for 16bit environment.
diff --git a/lib/irb.rb b/lib/irb.rb
index 7fe3d7dc5..f5e662ac5 100644
--- a/lib/irb.rb
+++ b/lib/irb.rb
@@ -107,7 +107,7 @@ module IRB
f = @context.prompt_c
elsif indent > 0
f = @context.prompt_n
- else @context.prompt_i
+ else
f = @context.prompt_i
end
f = "" unless f