diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | transcode.c | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Fri Dec 21 17:49:06 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * transcode.c (rb_str_transcode_bang): returns self if no conversion. + [ruby-dev:32662] + Fri Dec 21 17:44:47 2007 Eric Hodel <drbrain@segment7.net> * lib/rubygems*: Update to RubyGems 1.0.1, r1581 diff --git a/transcode.c b/transcode.c index 01acde79b5..cd3f56dc6b 100644 --- a/transcode.c +++ b/transcode.c @@ -370,7 +370,7 @@ rb_str_transcode_bang(int argc, VALUE *argv, VALUE str) VALUE newstr = str; int encidx = str_transcode(argc, argv, &newstr); - if (encidx < 0) return Qnil; + if (encidx < 0) return str; rb_str_shared_replace(str, newstr); rb_enc_associate_index(str, encidx); return str; |