1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* io.c (rb_io_ext_int_to_encs): Set external encoding if

Browse Source 
ext==intern. [ruby-dev:38278]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23976 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2009-07-07 01:15:32 +00:00
parent c19129be51
commit 999123c147
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Tue Jul 7 10:12:37 2009 NARUSE, Yui <naruse@ruby-lang.org>
* io.c (rb_io_ext_int_to_encs): Set external encoding if
ext==intern. [ruby-dev:38278]
Mon Jul 6 09:31:50 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Mon Jul 6 09:31:50 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* proc.c (make_curry_proc): should propagate lambda-ness. * proc.c (make_curry_proc): should propagate lambda-ness.

2
io.c
View File

@ -4101,7 +4101,7 @@ rb_io_ext_int_to_encs(rb_encoding *ext, rb_encoding *intern, rb_encoding **enc,
intern = rb_default_internal_encoding(); intern = rb_default_internal_encoding();
if (intern == NULL || intern == (rb_encoding *)Qnil || intern == ext) { if (intern == NULL || intern == (rb_encoding *)Qnil || intern == ext) {
/* No internal encoding => use external + no transcoding */ /* No internal encoding => use external + no transcoding */
*enc = default_ext ? NULL : ext; *enc = (default_ext && intern != ext) ? NULL : ext;
*enc2 = NULL; *enc2 = NULL;
} }
else { else {