summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--eval.c2
-rw-r--r--lib/rdoc/usage.rb3
3 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 1cb53684c9..f2d73bbd2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Aug 26 04:38:29 2004 Dave Thomas <dave@pragprog.com>
+
+ * eval.c (return_jump): Minor typo in error message. Now reads
+ "return can't jump across threads".
+
Tue Aug 24 17:30:00 2004 Shugo Maeda <shugo@ruby-lang.org>
* lib/cgi/session.rb (CGI::Session::FileStore#initialize): do not
diff --git a/eval.c b/eval.c
index 25584dd086..fa01bcdca3 100644
--- a/eval.c
+++ b/eval.c
@@ -4582,7 +4582,7 @@ return_jump(retval)
JUMP_TAG(TAG_RETURN);
}
if (tt->tag == PROT_THREAD) {
- rb_raise(rb_eThreadError, "return jump can't across threads");
+ rb_raise(rb_eThreadError, "return can't jump across threads");
}
tt = tt->prev;
}
diff --git a/lib/rdoc/usage.rb b/lib/rdoc/usage.rb
index 73821dfae1..da6593d89e 100644
--- a/lib/rdoc/usage.rb
+++ b/lib/rdoc/usage.rb
@@ -1,7 +1,7 @@
# = Synopsis
#
# This library allows command-line tools to encapsulate their usage
-# as a comment at the top of the main file. Calling <tt>RDoc::show_usage</tt>
+# as a comment at the top of the main file. Calling <tt>RDoc::usage</tt>
# then displays some or all of that comment, and optionally exits
# the program with an exit status. We always look for the comment
# in the main program file, so it is safe to call this method
@@ -190,7 +190,6 @@ module RDoc
#####
# Report the fact that no doc comment count be found
def RDoc.no_comment
-fail "xxx"
$stderr.puts "No usage information available for this program"
nil
end