aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ruby.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4777286b86..1a099c7f3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb 16 08:00:01 2008 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * ruby.c (process_options): set default_external before loading
+ libraries. [ruby-dev:33801]
+
Sat Feb 16 05:49:54 2008 NARUSE, Yui <naruse@ruby-lang.org>
* enc/iso_8859_{4,13}.c: Windows-1257 is replica of ISO-8859-13.
diff --git a/ruby.c b/ruby.c
index 5138e0841c..6574e1e995 100644
--- a/ruby.c
+++ b/ruby.c
@@ -1010,6 +1010,8 @@ process_options(VALUE arg)
else {
enc = rb_locale_encoding();
}
+ rb_enc_set_default_external(rb_enc_from_encoding(enc));
+
if (opt->e_script) {
rb_encoding *eenc;
if (opt->src.enc.index >= 0) {
@@ -1053,8 +1055,6 @@ process_options(VALUE arg)
}
}
- rb_enc_set_default_external(rb_enc_from_encoding(enc));
-
return (VALUE)tree;
}