diff options
| author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-08-28 07:05:17 +0000 |
|---|---|---|
| committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-08-28 07:05:17 +0000 |
| commit | 94c5f5a77ca629f8288230972eee6257c9626ce5 (patch) | |
| tree | 84cc0aadf5e682e2a50c1f026d5a15aaf2a38c31 /lib/rdoc/rdoc.rb | |
| parent | 5dfc455b72707c6e9150b92056d2607a16918f65 (diff) | |
* lib/rdoc/*: Update rdoc master(cfffed5)
https://github.com/rdoc/rdoc/pull/337
https://github.com/rdoc/rdoc/pull/367
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51715 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rdoc/rdoc.rb')
| -rw-r--r-- | lib/rdoc/rdoc.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/rdoc/rdoc.rb b/lib/rdoc/rdoc.rb index 4d45d47978..f4bb58e14b 100644 --- a/lib/rdoc/rdoc.rb +++ b/lib/rdoc/rdoc.rb @@ -353,7 +353,11 @@ option) return unless content filename_path = Pathname(filename).expand_path - relative_path = filename_path.relative_path_from @options.root + begin + relative_path = filename_path.relative_path_from @options.root + rescue ArgumentError + relative_path = filename_path + end if @options.page_dir and relative_path.to_s.start_with? @options.page_dir.to_s then |