usa	2008-07-08 00:38:33 +0900 (Tue, 08 Jul 2008)

  New Revision: 17947

  Modified files:
    branches/win32-unicode-test/ChangeLog
    branches/win32-unicode-test/ruby.c

  Log:
    * ruby.c (process_options): no need to call rb_w32_parse_cmdline() if
      locale == default_external.
    


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

Index: win32-unicode-test/ChangeLog
===================================================================
--- win32-unicode-test/ChangeLog	(revision 17946)
+++ win32-unicode-test/ChangeLog	(revision 17947)
@@ -1,3 +1,8 @@
+Tue Jul  8 00:37:50 2008  NAKAMURA Usaku  <usa@r...>
+
+	* ruby.c (process_options): no need to call rb_w32_parse_cmdline() if
+	  locale == default_external.
+
 Tue Jul  8 00:33:46 2008  NAKAMURA Usaku  <usa@r...>
 
 	* ruby.c (process_options): re-set e_script.
Index: win32-unicode-test/ruby.c
===================================================================
--- win32-unicode-test/ruby.c	(revision 17946)
+++ win32-unicode-test/ruby.c	(revision 17947)
@@ -1102,7 +1102,8 @@
     }
     rb_enc_set_default_external(rb_enc_from_encoding(enc));
 #ifdef _WIN32
-    if ((argc = rb_w32_parse_cmdline(&argv, rb_enc_name(enc))) != 0) {
+    if (enc != lenc &&
+	(argc = rb_w32_parse_cmdline(&argv, rb_enc_name(enc))) != 0) {
 	if (opt->e_script && opt->e_script_pos) {
 	    opt->e_script = rb_str_new(0, 0);
 	    for (i = 0; i < RARRAY_LEN(opt->e_script_pos); ++i) {

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