summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/rdoc/usage.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7c7e001b2f..26036ebdef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jan 6 07:58:28 2005 Dave Thomas <dave@pragprog.com>
+
+ * lib/rdoc/usage.rb (RDoc::RDoc.usage_no_exit): Allow for colons
+ in path names on DOS machines. (thanks to Johan Nilsson)
+
Thu Jan 6 00:02:35 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* test/rinda/test_rinda.rb: use MockClock.sleep instead of Kernel.sleep
diff --git a/lib/rdoc/usage.rb b/lib/rdoc/usage.rb
index da6593d89e..3e64cd6433 100644
--- a/lib/rdoc/usage.rb
+++ b/lib/rdoc/usage.rb
@@ -96,7 +96,7 @@ module RDoc
# Display usage
def RDoc.usage_no_exit(*args)
- main_program_file, = caller[-1].split(/:/, 2)
+ main_program_file, = caller[-1].split(/:\d+/, 2)
comment = File.open(main_program_file) do |file|
find_comment(file)
end