diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-01-30 12:54:15 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-01-30 12:54:15 +0000 |
| commit | a2339bc02147505ae459293c9fece5ae17b5f285 (patch) | |
| tree | 3f653f580e0222000c44f24f76112a67252968bc /gem_prelude.rb | |
| parent | 4de39cd34edf69376af707071f0a6fbeed90e091 (diff) | |
merges r25526,r25527,r25528,r25529,r25530 and r25555 from trunk into ruby_1_9_1.
--
* encoding.c (get_filesystem_encoding):
add Encoding.filesystem_encoding [ruby-dev:39546]
also see [ruby-core:25959]
--
* gem_prelude.rb (Gem.set_home):
force_encoding(Encoding.filesystem_encoding)
[ruby-dev:39546]
* gem_prelude.rb (Gem.set_paths): ditto.
--
Previous commit is for [ruby-core:25959]
--
* encoding.c (get_filesystem_encoding): removed.
* encoding.c (rb_locale_encindex): added.
* encoding.c (rb_filesystem_encindex): added.
* encoding.c (rb_filesystem_encindex): add an alias 'filesystem'.
[ruby-dev:39574]
* encoding.c (enc_find): add rdoc about special aliases.
* gem_prelude.rb (Gem.set_home): use Encoding.find('filesystem').
* gem_prelude.rb (Gem.set_paths): ditto.
--
* encoding.c (enc_find): fixed rdoc formatting.
--
* ruby.c (process_options): call rb_filesystem_encoding().
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@26510 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'gem_prelude.rb')
| -rw-r--r-- | gem_prelude.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gem_prelude.rb b/gem_prelude.rb index b5da35e186..1562d23a30 100644 --- a/gem_prelude.rb +++ b/gem_prelude.rb @@ -66,7 +66,7 @@ if defined?(Gem) then end def self.set_home(home) - @gem_home = home + @gem_home = home.force_encoding(Encoding.find('filesystem')) ensure_gem_subdirectories(@gem_home) end @@ -78,6 +78,7 @@ if defined?(Gem) then @gem_path = [Gem.dir] end @gem_path.uniq! + @gem_path.map!{|x|x.force_encoding(Encoding.find('filesystem'))} @gem_path.each do |gp| ensure_gem_subdirectories(gp) end end |