nobu	2008-01-25 15:56:50 +0900 (Fri, 25 Jan 2008)

  New Revision: 15230

  Modified files:
    trunk/ChangeLog
    trunk/ruby.c

  Log:
    * ruby.c (process_options): set encoding of -e option from -E option
      if they are compatible.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ruby.c?r1=15230&r2=15229&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15230&r2=15229&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15229)
+++ ChangeLog	(revision 15230)
@@ -1,4 +1,4 @@
-Fri Jan 25 15:41:20 2008  Nobuyoshi Nakada  <nobu@r...>
+Fri Jan 25 15:56:48 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* ruby.c (cmdline_arguments): split argc and argv from cmdline_options.
 
Index: ruby.c
===================================================================
--- ruby.c	(revision 15229)
+++ ruby.c	(revision 15230)
@@ -1021,6 +1021,9 @@
 	    rb_warning("-e conatains non ASCII string, encoding %s is not used",
 		       rb_enc_name(enc));
 	}
+	else {
+	    eenc = enc;
+	}
 	rb_enc_associate(opt->e_script, eenc);
 	require_libraries();
 	tree = rb_parser_compile_string(parser, opt->script, opt->e_script, 1);

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