diff options
-rw-r--r-- | ChangeLog | 11 | ||||
-rw-r--r-- | eval.c | 1 | ||||
-rw-r--r-- | lib/rdoc/ri/ri_paths.rb | 6 |
3 files changed, 18 insertions, 0 deletions
@@ -1,3 +1,9 @@ +Sat Mar 4 01:08:07 2006 Yukihiro Matsumoto <matz@ruby-lang.org> + + * lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems + directories. a patch from Eric Hodel <drbrain at segment7.net>. + [ruby-core:07423] + Thu Mar 2 19:44:18 2006 Tanaka Akira <akr@m17n.org> * gc.c: align VALUE with sizeof(RVALUE) globally. @@ -6,6 +12,11 @@ Thu Mar 2 19:44:18 2006 Tanaka Akira <akr@m17n.org> (rb_obj_id): ditto. moved from object.c. [ruby-talk:178364] [ruby-core:7305] +Thu Mar 2 18:58:18 2006 Yukihiro Matsumoto <matz@ruby-lang.org> + + * eval.c (rb_thread_fd_writable): should not re-schedule output + from KILLED thread (must be error printing). + Thu Mar 2 17:57:49 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp> * gc.c: commited magic for reducing RVALUE size on windows. (24->20byte) @@ -10737,6 +10737,7 @@ rb_thread_fd_writable(fd) if (rb_thread_critical) return Qtrue; if (curr_thread == curr_thread->next) return Qtrue; if (curr_thread->status == THREAD_TO_KILL) return Qtrue; + if (curr_thread->status == THREAD_KILLED) return Qtrue; curr_thread->status = THREAD_STOPPED; FD_ZERO(&curr_thread->readfds); diff --git a/lib/rdoc/ri/ri_paths.rb b/lib/rdoc/ri/ri_paths.rb index 32c2542c04..07d900238f 100644 --- a/lib/rdoc/ri/ri_paths.rb +++ b/lib/rdoc/ri/ri_paths.rb @@ -47,5 +47,11 @@ module RI # This is the search path for 'ri' PATH = [ SYSDIR, SITEDIR, HOMEDIR ].find_all {|p| p && File.directory?(p)} + + begin + require 'rubygems' + Dir["#{Gem.path}/doc/*/ri"].each { |path| RI::Paths::PATH << path } + rescue LoadError + end end end |