yugui	2009-06-25 01:03:32 +0900 (Thu, 25 Jun 2009)

  New Revision: 23841

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

  Log:
    merges r23813 and r23821 from trunk into ruby_1_9_1.
    --
    * ruby.c (process_options), enc/prelude.rb: encdb and transdb are
      extension libraries.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/enc/prelude.rb
    branches/ruby_1_9_1/ruby.c

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 23840)
+++ ruby_1_9_1/ChangeLog	(revision 23841)
@@ -1,3 +1,10 @@
+Mon Jun 22 14:41:47 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* ruby.c (process_options), enc/prelude.rb: encdb and transdb are
+	  extension libraries.
+
+	* ruby.c (process_options): set progname earlier.
+
 Sun Jun 21 22:33:05 2009  Yusuke Endoh  <mame@t...>
 
 	* load.c (Init_load): $: must be readonly.  [ruby-dev:38690]
Index: ruby_1_9_1/enc/prelude.rb
===================================================================
--- ruby_1_9_1/enc/prelude.rb	(revision 23840)
+++ ruby_1_9_1/enc/prelude.rb	(revision 23841)
@@ -1,4 +1,4 @@
-%w'enc/encdb enc/trans/transdb'.each do |init|
+%w'enc/encdb.so enc/trans/transdb.so'.each do |init|
   begin
     require(init)
   rescue LoadError
Index: ruby_1_9_1/ruby.c
===================================================================
--- ruby_1_9_1/ruby.c	(revision 23840)
+++ ruby_1_9_1/ruby.c	(revision 23841)
@@ -1274,7 +1274,7 @@
     rb_obj_freeze(opt->script_name);
 
     ruby_init_loadpath_safe(opt->safe_level);
-    rb_enc_find_index("encdb");
+    rb_enc_find_index("encdb.so");
     lenc = rb_locale_encoding();
     rb_enc_associate(rb_progname, lenc);
     parser = rb_parser_new();

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