diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-11 22:52:39 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-11 22:52:39 +0000 |
| commit | e666111955d0f48f2bc0283c2867da938b98982c (patch) | |
| tree | d8c42d9e1b2958a8f0c5abc758dbf59627f9f997 /encoding.c | |
| parent | 8b83fc27048ff1c30e6f55355874d16ba7544c2d (diff) | |
* encoding.c (rb_enc_compatible): If a string is empty and
other's encoding is US-ASCII, returns the empty string's encoding.
[ruby-list:46274]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24506 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'encoding.c')
| -rw-r--r-- | encoding.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/encoding.c b/encoding.c index 42b2475f41..2118eba3e4 100644 --- a/encoding.c +++ b/encoding.c @@ -709,9 +709,9 @@ rb_enc_compatible(VALUE str1, VALUE str2) enc2 = rb_enc_from_index(idx2); if (TYPE(str2) == T_STRING && RSTRING_LEN(str2) == 0) - return enc1; + return (idx1 == ENCINDEX_US_ASCII && rb_enc_asciicompat(enc2)) ? enc2 : enc1; if (TYPE(str1) == T_STRING && RSTRING_LEN(str1) == 0) - return enc2; + return (idx2 == ENCINDEX_US_ASCII && rb_enc_asciicompat(enc1)) ? enc1 : enc2; if (!rb_enc_asciicompat(enc1) || !rb_enc_asciicompat(enc2)) { return 0; } |