summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--lib/rdoc/parser/ruby.rb2
-rw-r--r--lib/rdoc/stats.rb4
3 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 3b9ea85fb7..83ffc91bd2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sat Apr 3 01:50:02 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/rdoc/parser/ruby.rb (RDoc#make_message): no empty lines.
+
+ * lib/rdoc/stats.rb (RDoc::Normal#print_file): send to stdout and
+ flush always
+
Sat Apr 3 00:03:11 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/rdoc/class_module.rb (RDoc#merge): get rid of stack overflow.
diff --git a/lib/rdoc/parser/ruby.rb b/lib/rdoc/parser/ruby.rb
index 1a03b1c808..7550508b81 100644
--- a/lib/rdoc/parser/ruby.rb
+++ b/lib/rdoc/parser/ruby.rb
@@ -417,7 +417,7 @@ class RDoc::Parser::Ruby < RDoc::Parser
# Adds useful info about the parser to +message+
def make_message message
- prefix = "\n#{@file_name}:"
+ prefix = "#{@file_name}:"
prefix << "#{@scanner.line_no}:#{@scanner.char_no}:" if @scanner
diff --git a/lib/rdoc/stats.rb b/lib/rdoc/stats.rb
index 8f51cbedcc..82e0afdf5d 100644
--- a/lib/rdoc/stats.rb
+++ b/lib/rdoc/stats.rb
@@ -190,10 +190,10 @@ class RDoc::Stats
line << (" " * padding) if padding > 0
$stdout.print("#{line}\r")
- $stdout.flush
else
- puts "#{progress_bar} #{filename}"
+ $stdout.puts "#{progress_bar} #{filename}"
end
+ $stdout.flush
end
def done_adding # :nodoc: