From 96284ce43b316f552a110f86648ba271068b6864 Mon Sep 17 00:00:00 2001 From: matz Date: Fri, 3 Mar 2006 17:39:28 +0000 Subject: * lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems directories. a patch from Eric Hodel . [ruby-core:07423] * eval.c (rb_thread_fd_writable): should not re-schedule output from KILLED thread (must be error printing). git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@10020 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 11 +++++++++++ eval.c | 1 + lib/rdoc/ri/ri_paths.rb | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/ChangeLog b/ChangeLog index 4d62d92c5..f151d31aa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Mar 4 01:08:07 2006 Yukihiro Matsumoto + + * lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems + directories. a patch from Eric Hodel . + [ruby-core:07423] + Thu Mar 2 19:44:18 2006 Tanaka Akira * gc.c: align VALUE with sizeof(RVALUE) globally. @@ -6,6 +12,11 @@ Thu Mar 2 19:44:18 2006 Tanaka Akira (rb_obj_id): ditto. moved from object.c. [ruby-talk:178364] [ruby-core:7305] +Thu Mar 2 18:58:18 2006 Yukihiro Matsumoto + + * 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 * gc.c: commited magic for reducing RVALUE size on windows. (24->20byte) diff --git a/eval.c b/eval.c index fb1e4006b..9f9626651 100644 --- a/eval.c +++ b/eval.c @@ -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 32c2542c0..07d900238 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 -- cgit