From 30527783c73c369b915d31127d4837378ce1a457 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 2 Apr 2010 05:17:01 +0000 Subject: [PATCH] * lib/rdoc/parser/ruby.rb (RDoc::Parser::Ruby): parse also rdoc files. reapplied r24976. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27182 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 ++++- lib/rdoc/parser/ruby.rb | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 639367b6b3..24b9bedefd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ -Fri Apr 2 14:14:28 2010 Nobuyoshi Nakada +Fri Apr 2 14:16:54 2010 Nobuyoshi Nakada + + * lib/rdoc/parser/ruby.rb (RDoc::Parser::Ruby): parse also rdoc + files. reapplied r24976. * lib/rdoc/parser/c.rb: fixed a small error in the documentation. [ruby-core:24744] reapplied r24395. diff --git a/lib/rdoc/parser/ruby.rb b/lib/rdoc/parser/ruby.rb index 8072293b09..03825349a2 100644 --- a/lib/rdoc/parser/ruby.rb +++ b/lib/rdoc/parser/ruby.rb @@ -146,7 +146,7 @@ $TOKEN_DEBUG ||= nil class RDoc::Parser::Ruby < RDoc::Parser - parse_files_matching(/\.rbw?$/) + parse_files_matching(/\.(?:rbw?|rdoc)\z/) include RDoc::RubyToken include RDoc::TokenStream