From d66a188c4a1aa269be94c5707df3aeff185dd076 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 21 Dec 2007 08:49:08 +0000
Subject: [PATCH] * transcode.c (rb_str_transcode_bang): returns self if no
 conversion.   [ruby-dev:32662]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14425 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog   | 5 +++++
 transcode.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 7e70ccc4b8..1f6c0d850b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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;