diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/drb/observer.rb | 2 | ||||
| -rw-r--r-- | lib/rdoc/generators/html_generator.rb | 10 |
3 files changed, 14 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Wed Mar 24 11:11:26 2004 Dave Thomas <dave@pragprog.com> + + * lib/rdoc/generators/html_generator.rb (Generators::HTMLGenerator::load_html_template): + Allow non-RDoc templates by putting a slash in the template name + Mon Mar 22 16:19:57 2004 WATANABE Hirofumi <eban@ruby-lang.org> * ruby.1: add -width option to .Bl for old groff. diff --git a/lib/drb/observer.rb b/lib/drb/observer.rb index e7f1668c52..0215065ee9 100644 --- a/lib/drb/observer.rb +++ b/lib/drb/observer.rb @@ -9,8 +9,10 @@ module DRb if defined? @observer_peers for i in @observer_peers.dup begin + puts "sending update" i.update(*arg) rescue + p $! delete_observer(i) end end diff --git a/lib/rdoc/generators/html_generator.rb b/lib/rdoc/generators/html_generator.rb index 8db578b934..ca3019f5cc 100644 --- a/lib/rdoc/generators/html_generator.rb +++ b/lib/rdoc/generators/html_generator.rb @@ -1110,11 +1110,15 @@ module Generators private ## - # Load up the HTML template specified in the options + # Load up the HTML template specified in the options. + # If the template name contains a slash, use it literally # def load_html_template - template = File.join("rdoc/generators/template", - @options.generator.key, @options.template) + template = @options.template + unless template =~ %r{/|\\} + template = File.join("rdoc/generators/template", + @options.generator.key, template) + end require template extend RDoc::Page rescue LoadError |