summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-02-08 00:54:21 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-02-08 00:54:21 +0000
commitbaa14688953cb5ce9013dfc9a5437f0ce352fbde (patch)
treef4e40a8398aea6554c3ddd95437f808f3b5b4382
parent2bef7dece17c3ef98c1c0aca08d4028d6afc998a (diff)
* lib/rdoc/ri/driver.rb (read_yaml): remove SM* for compatibility.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15400 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--lib/rdoc/ri/driver.rb2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e696f9ab8e..31072a8b10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Feb 8 09:27:57 2008 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * lib/rdoc/ri/driver.rb (read_yaml): remove SM* for compatibility.
+
Fri Feb 08 00:07:24 2008 Yusuke Endoh <mame@tsg.ne.jp>
* test/ruby/test_hash.rb: follow the change of Hash#flatten.
diff --git a/lib/rdoc/ri/driver.rb b/lib/rdoc/ri/driver.rb
index 67817b1806..02271de3dd 100644
--- a/lib/rdoc/ri/driver.rb
+++ b/lib/rdoc/ri/driver.rb
@@ -341,7 +341,7 @@ Options may also be set in the 'RI' environment variable.
end
def read_yaml(path)
- YAML.load File.read(path).gsub(/ \!ruby\/(object|struct):(RDoc::RI|RI).*/, '')
+ YAML.load File.read(path).gsub(/ \!ruby\/(object|struct):(RDoc::RI|RI|SM).*/, '')
end
def run