From 336a8301f725bd8fbf5f1e0c4fee162382a76d0f Mon Sep 17 00:00:00 2001
From: drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 27 Apr 2010 03:45:22 +0000
Subject: Import RDoc 2.5.7.  Fixes #1318 and ruby-core:29780

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27509 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/rdoc/options.rb | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'lib/rdoc/options.rb')

diff --git a/lib/rdoc/options.rb b/lib/rdoc/options.rb
index 7b3a23ca5c..90415f0aa4 100644
--- a/lib/rdoc/options.rb
+++ b/lib/rdoc/options.rb
@@ -366,6 +366,11 @@ Usage: #{opt.program_name} [options] [names...]
       end
     end
 
+    if @pipe and not argv.empty? then
+      @pipe = false
+      ignored << '-p (with files)'
+    end
+
     unless ignored.empty? or quiet then
       $stderr.puts "invalid options: #{ignored.join ', '}"
       $stderr.puts '(invalid options are ignored)'
-- 
cgit v1.2.3