diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-26 05:54:41 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-26 05:54:41 +0000 |
| commit | da0264dc49c00958798a5a0e6aa3fbc6f50098ba (patch) | |
| tree | 3093c8ae35fc9ff6a9691537fd6636e678181d62 /transcode.c | |
| parent | c5db6d0499e9fe43fc570409e01b5fd12bdbf077 (diff) | |
| download | ruby-da0264dc49c00958798a5a0e6aa3fbc6f50098ba.tar.gz ruby-da0264dc49c00958798a5a0e6aa3fbc6f50098ba.tar.xz ruby-da0264dc49c00958798a5a0e6aa3fbc6f50098ba.zip | |
merges r21047 from trunk into ruby_1_9_1.
* transcode.c (str_transcode0): set encoding when String#encode was
given explicit but the same destination and source encoding.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21064 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'transcode.c')
| -rw-r--r-- | transcode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/transcode.c b/transcode.c index e5538a087..7cdda7b7b 100644 --- a/transcode.c +++ b/transcode.c @@ -2455,7 +2455,7 @@ str_transcode0(int argc, VALUE *argv, VALUE *self, int ecflags, VALUE ecopts) ECONV_XML_ATTR_CONTENT_DECORATOR| ECONV_XML_ATTR_QUOTE_DECORATOR)) == 0) { if (senc && senc == denc) { - return -1; + return NIL_P(arg2) ? -1 : dencidx; } if (senc && denc && rb_enc_asciicompat(senc) && rb_enc_asciicompat(denc)) { if (ENC_CODERANGE(str) == ENC_CODERANGE_7BIT) { @@ -2463,7 +2463,7 @@ str_transcode0(int argc, VALUE *argv, VALUE *self, int ecflags, VALUE ecopts) } } if (encoding_equal(sname, dname)) { - return -1; + return NIL_P(arg2) ? -1 : dencidx; } } else { |