summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--enc/prelude.rb6
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 51fe5c9aaa..109dde98fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Oct 20 23:59:38 2014 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * 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@ruby-lang.org>
* common.mk (lib/unicode_normlize/table.rb): enable running (n)make
diff --git a/enc/prelude.rb b/enc/prelude.rb
index cae1b91695..a70e82ba7a 100644
--- a/enc/prelude.rb
+++ b/enc/prelude.rb
@@ -4,4 +4,8 @@
rescue LoadError
end
end
-require 'unicode_normalize'
+
+begin
+ require 'unicode_normalize'
+rescue LoadError
+end