Import RDoc 3

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30249 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 6 insertions, 3 deletions

diff --git a/lib/rdoc/markup/verbatim.rb b/lib/rdoc/markup/verbatim.rb
index c684d78765..8fe2184699 100644
--- a/lib/rdoc/markup/verbatim.rb
+++ b/lib/rdoc/markup/verbatim.rb
@@ -3,6 +3,9 @@
 
 class RDoc::Markup::Verbatim < RDoc::Markup::Raw
 
+  ##
+  # Calls #accept_verbatim on +visitor+
+
   def accept visitor
     visitor.accept_verbatim self
   end
@@ -17,16 +20,16 @@ class RDoc::Markup::Verbatim < RDoc::Markup::Raw
 
     @parts.each do |part|
       case part
-      when /\n/ then
+      when /^\s*\n/ then
         newlines += 1
-        parts << part if newlines <= 2
+        parts << part if newlines == 1
       else
         newlines = 0
         parts << part
       end
     end
 
-    parts.slice!(-1) if parts[-2..-1] == ["\n", "\n"]
+    parts.pop if parts.last =~ /\A\r?\n\z/
 
     @parts = parts
   end