yugui	2009-06-21 19:36:42 +0900 (Sun, 21 Jun 2009)

  New Revision: 23807

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

  Log:
    merges r23773 from trunk into ruby_1_9_1.
    --
    * transcode.c (enc_arg): default interanl encoding may not be set.
      [ruby-core:23932]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/transcode.c
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 23806)
+++ ruby_1_9_1/ChangeLog	(revision 23807)
@@ -1,3 +1,8 @@
+Sun Jun 21 10:46:32 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* transcode.c (enc_arg): default interanl encoding may not be set.
+	  [ruby-core:23932]
+
 Sat Jun 20 07:17:52 2009  Yukihiro Matsumoto  <matz@r...>
 
 	* lib/monitor.rb (MonitorMixin::extend_object): should use
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 23806)
+++ ruby_1_9_1/version.h	(revision 23807)
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "1.9.1"
 #define RUBY_RELEASE_DATE "2009-05-22"
-#define RUBY_PATCHLEVEL 197
+#define RUBY_PATCHLEVEL 198
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
Index: ruby_1_9_1/transcode.c
===================================================================
--- ruby_1_9_1/transcode.c	(revision 23806)
+++ ruby_1_9_1/transcode.c	(revision 23807)
@@ -2394,13 +2394,13 @@
     int encidx;
     VALUE encval;
 
-    if ((encidx = rb_to_encoding_index(encval = *arg)) < 0) {
+    if (((encidx = rb_to_encoding_index(encval = *arg)) < 0) ||
+	!(enc = rb_enc_from_index(encidx))) {
 	enc = NULL;
 	encidx = 0;
 	n = StringValueCStr(*arg);
     }
     else {
-	enc = rb_enc_from_index(encidx);
 	n = rb_enc_name(enc);
     }
 

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