archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-15 16:44:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merges r21528 from trunk into ruby_1_9_1.

Browse source 
* encoding.c (enc_set_default_encoding): should not treat US-ASCII
  special here.  a patch from Yui NARUSE in [ruby-dev:37769].
  [ruby-dev:37699]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21566 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2009-01-15 15:40:06 +00:00
parent 2f2497ee53
commit e1ccf2699d
2 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Thu Jan 15 15:55:31 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
* encoding.c (enc_set_default_encoding): should not treat US-ASCII
special here. a patch from Yui NARUSE in [ruby-dev:37769].
[ruby-dev:37699]
Thu Jan 15 13:10:09 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu Jan 15 13:10:09 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in, win32/Makefile.sub (MISSING): added langinfo on mingw * configure.in, win32/Makefile.sub (MISSING): added langinfo on mingw

9
encoding.c
View file

@ -1050,8 +1050,7 @@ struct default_encoding {
}; };
static int static int
enc_set_default_encoding(struct default_encoding *def, VALUE encoding, enc_set_default_encoding(struct default_encoding *def, VALUE encoding, const char *name)
const char *name, int defindex)
{ {
int overridden = Qfalse; int overridden = Qfalse;
if (def->index != -2) if (def->index != -2)
@ -1066,8 +1065,6 @@ enc_set_default_encoding(struct default_encoding *def, VALUE encoding,
} }
else { else {
def->index = rb_enc_to_index(rb_to_encoding(encoding)); def->index = rb_enc_to_index(rb_to_encoding(encoding));
if (def->index == ENCINDEX_US_ASCII)
def->index = defindex;
def->enc = 0; def->enc = 0;
enc_alias_internal(name, def->index); enc_alias_internal(name, def->index);
} }
@ -1118,7 +1115,7 @@ rb_enc_set_default_external(VALUE encoding)
rb_raise(rb_eArgError, "default external can not be nil"); rb_raise(rb_eArgError, "default external can not be nil");
} }
enc_set_default_encoding(&default_external, encoding, enc_set_default_encoding(&default_external, encoding,
"external", ENCINDEX_US_ASCII); "external");
} }
/* /*
@ -1171,7 +1168,7 @@ void
rb_enc_set_default_internal(VALUE encoding) rb_enc_set_default_internal(VALUE encoding)
{ {
enc_set_default_encoding(&default_internal, encoding, enc_set_default_encoding(&default_internal, encoding,
"internal", ENCINDEX_UTF_8); "internal");
} }
/* /*