usa	2014-10-21 00:01:13 +0900 (Tue, 21 Oct 2014)

  New Revision: 48060

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

  Log:
    * enc/prelude.rb: we sometimes run ruby without library path (especially
      for test), so should permit to run ruby if unicode_normalize.rb is
      missing.

  Modified files:
    trunk/ChangeLog
    trunk/enc/prelude.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 48059)
+++ ChangeLog	(revision 48060)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Mon Oct 20 23:59:38 2014  NAKAMURA Usaku  <usa@r...>
+
+	* enc/prelude.rb: we sometimes run ruby without library path (especially
+	  for test), so should permit to run ruby if unicode_normalize.rb is
+	  missing.
+
 Mon Oct 20 23:57:58 2014  NAKAMURA Usaku  <usa@r...>
 
 	* common.mk (lib/unicode_normlize/table.rb): enable running (n)make
Index: enc/prelude.rb
===================================================================
--- enc/prelude.rb	(revision 48059)
+++ enc/prelude.rb	(revision 48060)
@@ -4,4 +4,8 @@ https://github.com/ruby/ruby/blob/trunk/enc/prelude.rb#L4
   rescue LoadError
   end
 end
-require 'unicode_normalize'
+
+begin
+  require 'unicode_normalize'
+rescue LoadError
+end

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