* ruby.c (process_options): set encoding of -e option from -E option

  if they are compatible.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15230 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 4 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 279645a39d..d63ec41a46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Fri Jan 25 15:41:20 2008  Nobuyoshi Nakada  <[email protected]>
+Fri Jan 25 15:56:48 2008  Nobuyoshi Nakada  <[email protected]>
 
 	* ruby.c (cmdline_arguments): split argc and argv from cmdline_options.
 
diff --git a/ruby.c b/ruby.c
index c2b0b5cfc5..0573595234 100644
--- a/ruby.c
+++ b/ruby.c
@@ -1021,6 +1021,9 @@ process_options(VALUE arg)
 	    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);