summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-03-30 15:43:51 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-03-30 15:43:51 +0000
commitd0be5c2d4c317c3cd71cf438a704a3f79721367c (patch)
tree6bdfdb8f2839ab999c59f8a8cec5e9580f451454 /ChangeLog
parent3041f2156eae5dbcbe14562b6eef9389c9c50bdd (diff)
merge revision(s) r45360,r45361: [Backport #9651]
* vm_eval.c (eval_string_with_cref): Use file path even if scope is given. Related to [ruby-core:56099] [Bug #8662] and r42103. * vm_eval.c (eval_string_with_cref): Unify to use NIL_P. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45474 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog9
1 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d4c13f5582..c9e0c0a323 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Mon Mar 31 00:15:45 2014 Shota Fukumori <her@sorah.jp>
+
+ * vm_eval.c (eval_string_with_cref): Unify to use NIL_P.
+
+Mon Mar 31 00:15:45 2014 Shota Fukumori <her@sorah.jp>
+
+ * vm_eval.c (eval_string_with_cref): Use file path even if scope is
+ given. Related to [ruby-core:56099] [Bug #8662] and r42103.
+
Mon Mar 31 00:02:04 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (yycompile): store file name as String to keep the encoding.