nobu	2007-12-21 17:49:08 +0900 (Fri, 21 Dec 2007)

  New Revision: 14425

  Modified files:
    trunk/ChangeLog
    trunk/transcode.c

  Log:
    * transcode.c (rb_str_transcode_bang): returns self if no conversion.
      [ruby-dev:32662]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14425&r2=14424
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/transcode.c?r1=14425&r2=14424

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 14424)
+++ ChangeLog	(revision 14425)
@@ -1,3 +1,8 @@
+Fri Dec 21 17:49:06 2007  Nobuyoshi Nakada  <nobu@r...>
+
+	* transcode.c (rb_str_transcode_bang): returns self if no conversion.
+	  [ruby-dev:32662]
+
 Fri Dec 21 17:44:47 2007  Eric Hodel  <drbrain@s...>
 
 	* lib/rubygems*:  Update to RubyGems 1.0.1, r1581
Index: transcode.c
===================================================================
--- transcode.c	(revision 14424)
+++ transcode.c	(revision 14425)
@@ -370,7 +370,7 @@
     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;

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml