summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/irb.rb8
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index e8c7b15666..7179f3f806 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jun 19 11:11:37 2010 Yukihiro Matsumoto <[email protected]>
+
+ * lib/irb.rb: remove double exclamation marks. a patch from Diego
+ Viola. [ruby-core:30589]
+
Sat Jun 19 03:35:58 2010 Aaron Patterson <[email protected]>
* ext/psych/lib/psych/visitors/to_ruby.rb (resolve_klass): fix the
diff --git a/lib/irb.rb b/lib/irb.rb
index 7a9d438b5b..d3bab8978f 100644
--- a/lib/irb.rb
+++ b/lib/irb.rb
@@ -85,9 +85,9 @@ module IRB
def IRB.irb_abort(irb, exception = Abort)
if defined? Thread
- irb.context.thread.raise exception, "abort then interrupt!!"
+ irb.context.thread.raise exception, "abort then interrupt!"
else
- raise exception, "abort then interrupt!!"
+ raise exception, "abort then interrupt!"
end
end
@@ -195,7 +195,7 @@ module IRB
printf "... %d levels...\n", levels if levels > 0
print lasts.join("\n")
end
- print "Maybe IRB bug!!\n" if irb_bug
+ print "Maybe IRB bug!\n" if irb_bug
end
if $SAFE > 2
abort "Error: irb does not work for $SAFE level higher than 2"
@@ -245,7 +245,7 @@ module IRB
def signal_handle
unless @context.ignore_sigint?
- print "\nabort!!\n" if @context.verbose?
+ print "\nabort!\n" if @context.verbose?
exit
end