naruse	2009-01-19 03:32:24 +0900 (Mon, 19 Jan 2009)

  New Revision: 21649

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21649

  Log:
    * transcode.c (str_transcode0): fix: :xml option doesn't
      work on str.encode([options]) form without default_internal.

  Modified files:
    trunk/ChangeLog
    trunk/transcode.c
    trunk/version.h

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 21648)
+++ ChangeLog	(revision 21649)
@@ -1,3 +1,8 @@
+Mon Jan 19 03:06:22 2009  NARUSE, Yui  <naruse@r...>
+
+	* transcode.c (str_transcode0): fix: :xml option doesn't
+	  work on str.encode([options]) form without default_internal.
+
 Sun Jan 18 16:56:46 2009  Tanaka Akira  <akr@f...>
 
 	* ext/socket/raddrinfo.c (addrinfo_inspect_sockaddr): new
Index: version.h
===================================================================
--- version.h	(revision 21648)
+++ version.h	(revision 21649)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_RELEASE_DATE "2009-01-18"
+#define RUBY_RELEASE_DATE "2009-01-19"
 #define RUBY_PATCHLEVEL 5000
 #define RUBY_BRANCH_NAME "trunk"
 
@@ -8,7 +8,7 @@
 #define RUBY_VERSION_TEENY 1
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 18
+#define RUBY_RELEASE_DAY 19
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: transcode.c
===================================================================
--- transcode.c	(revision 21648)
+++ transcode.c	(revision 21649)
@@ -2457,7 +2457,8 @@
     if (argc == 0) {
 	arg1 = rb_enc_default_internal();
 	if (NIL_P(arg1)) {
-	    return -1;
+	    if (!ecflags) return -1;
+	    arg1 = rb_obj_encoding(str);
 	}
 	ecflags |= ECONV_INVALID_REPLACE | ECONV_UNDEF_REPLACE;
     }

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