summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--lib/rdoc/code_objects.rb4
-rw-r--r--lib/rdoc/generator/html.rb2
-rw-r--r--lib/rdoc/ri/writer.rb6
4 files changed, 16 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 5ff406940..57f1138a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sun Mar 9 09:52:00 2008 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rdoc/code_objects.rb: Remove debugging Kernel#p. Patch by
+ Lincoln Stoll <lstoll at lstoll.net>
+ * lib/rdoc/generator/html.rb: Fully qualify AllReferences. Patch by
+ Lincoln Stoll <lstoll at lstoll.net>
+ * lib/rdoc/ri/writer.rb: Fix 1.8 backwards compatibility.
+
Sat Mar 8 18:50:57 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* file.c (isdirsep): backslash is valid path separator on cygwin too.
diff --git a/lib/rdoc/code_objects.rb b/lib/rdoc/code_objects.rb
index da383d69c..b93ec9900 100644
--- a/lib/rdoc/code_objects.rb
+++ b/lib/rdoc/code_objects.rb
@@ -410,8 +410,8 @@ module RDoc
end
if result && method
if !result.respond_to?(:find_local_symbol)
- p result.name
- p method
+ #p result.name
+ #p method
fail
end
result = result.find_local_symbol(method)
diff --git a/lib/rdoc/generator/html.rb b/lib/rdoc/generator/html.rb
index 95617725e..f035857af 100644
--- a/lib/rdoc/generator/html.rb
+++ b/lib/rdoc/generator/html.rb
@@ -247,7 +247,7 @@ class RDoc::Generator::HTML
@main_page = @options.main_page
@main_page_ref = nil
if @main_page
- @main_page_ref = AllReferences[@main_page]
+ @main_page_ref = RDoc::Generator::AllReferences[@main_page]
if @main_page_ref then
@main_page_path = @main_page_ref.path
else
diff --git a/lib/rdoc/ri/writer.rb b/lib/rdoc/ri/writer.rb
index 2d14942bd..92aaa1c2d 100644
--- a/lib/rdoc/ri/writer.rb
+++ b/lib/rdoc/ri/writer.rb
@@ -12,7 +12,11 @@ class RDoc::RI::Writer
# form (where punctuation is replaced by %xx)
def self.internal_to_external(name)
- name.gsub(/\W/) { "%%%02x" % $&[0].ord }
+ if ''.respond_to? :ord then
+ name.gsub(/\W/) { "%%%02x" % $&[0].ord }
+ else
+ name.gsub(/\W/) { "%%%02x" % $&[0] }
+ end
end
##