From 278ed4917e7aa75ae46495074622f03bb0d150b1 Mon Sep 17 00:00:00 2001 From: yugui Date: Sat, 13 Dec 2008 01:02:43 +0000 Subject: merges r20625, r20633, r20656 and r20665 from trunk into ruby_1_9_1. -- * encoding.c (enc_set_default_encoding): allowed to set default encoding. -- * encoding.c (rb_enc_aliases_enc_i): skips default internal. -- * encoding.c (enc_get_default_encoding): removed. Generalizing rb_default_{external,internal}_encoding seems to be difficult. default_external cannot be NULL even before detected. [ruby-dev:37390] * encoding.c (rb_default_external_encoding): has its own implementation again. * encoding.c (rb_default_internal_encoding): ditto. * gem_prelude.rb: added notice. * ruby.c (rubylib_mangled_path, rubylib_mangled_path2): uses locale encoding but not ASCII-8BIT. * ruby.c (process_options): refers less to default_external. -- * encoding.c (rb_enc_set_default_external): default_internal can be nil, but default_external cannot. * encoding.c (rb_set_default_internal): adds rdoc. * encoding.c (enc_find): ditto. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20698 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 38 +++++++++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 692ca70a3..f25611b27 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,39 @@ -Thu Dec 11 13:17:04 2008 Nobuyoshi Nakada +Fri Dec 12 19:29:07 2008 Yuki Sonoda (Yugui) - * encoding.c (rb_enc_set_default_internal): defines internal - encoding as nil. + * encoding.c (rb_enc_set_default_external): default_internal can be + nil, but default_external cannot. + + * encoding.c (rb_set_default_internal): adds rdoc. + + * encoding.c (enc_find): ditto. + +Fri Dec 12 14:09:55 2008 Yuki Sonoda (Yugui) + + * encoding.c (enc_get_default_encoding): removed. + Generalizing rb_default_{external,internal}_encoding seems to be + difficult. + default_external cannot be NULL even before detected. [ruby-dev:37390] + + * encoding.c (rb_default_external_encoding): has its own + implementation again. + + * encoding.c (rb_default_internal_encoding): ditto. + + * gem_prelude.rb: added notice. + + * ruby.c (rubylib_mangled_path, rubylib_mangled_path2): uses locale + encoding but not ASCII-8BIT. + + * ruby.c (process_options): refers less to default_external. + +Thu Dec 11 20:05:17 2008 Nobuyoshi Nakada + + * encoding.c (rb_enc_aliases_enc_i): skips default internal. + +Thu Dec 11 13:36:18 2008 Nobuyoshi Nakada + + * encoding.c (enc_set_default_encoding): allowed to set default + encoding. * encoding.c (rb_locale_encoding): removed Encoding::LOCALE. -- cgit