kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merging r22085 needs r20086. [ruby-dev:38067]

Browse source 
merges r22086 from trunk into ruby_1_9_1.
	* ruby.c (process_options): set initial default_external before -r.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@22729 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2009-03-03 11:38:55 +00:00
parent 41031667c9
commit 18c0a7eebf
2 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Fri Feb 6 12:11:24 2009 NAKAMURA Usaku <usa@ruby-lang.org>
* ruby.c (process_options): set initial default_external before -r.
Sun Feb 22 10:43:57 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm_eval.c (method_missing): should not pop cfp if missing method

7
ruby.c
View file

@ -1289,6 +1289,13 @@ process_options(VALUE arg)
opt->src.enc.index = opt_enc_index(opt->src.enc.name);
src_encoding_index = opt->src.enc.index;
}
if (opt->ext.enc.index >= 0) {
enc = rb_enc_from_index(opt->ext.enc.index);
}
else {
enc = lenc;
}
rb_enc_set_default_external(rb_enc_from_encoding(enc));
if (opt->intern.enc.index >= 0) {
enc = rb_enc_from_index(opt->intern.enc.index);
rb_enc_set_default_internal(rb_enc_from_encoding(enc));