summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-10-20 15:01:13 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-10-20 15:01:13 +0000
commitee4782f7749b714a5063d0127f6057566394da9d (patch)
tree150d6af926da90aad3036ff951b93162263befff
parent345c1408a94d5dbb62ed85c0ff0aa864251f203a (diff)
* 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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48060 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-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