aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-12-09 03:48:35 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-12-09 03:48:35 +0000
commit3992aaa36c0b62c560836ffdcc192c2a93929455 (patch)
treee7efb85d67be409636a87de012c282a76e41569c
parent428791543be9e13af9426970f5796f3157dd30a0 (diff)
downloadruby-3992aaa36c0b62c560836ffdcc192c2a93929455.tar.gz
vm_eval.c: fix `rb_eval_string_wrap` rdoc
* vm_eval.c (rb_eval_string_wrap): [DOC] Fix `rb_eval_string_wrap` documentation. It is referencing `require` instead of `load`. The former does not have the optional argument. [Fix GH-779] [ci skip] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48745 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--vm_eval.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 74fa222989..58c37cdf66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Dec 9 12:48:32 2014 Josef Simanek <josef.simanek@gmail.com>
+
+ * vm_eval.c (rb_eval_string_wrap): [DOC] Fix `rb_eval_string_wrap`
+ documentation. It is referencing `require` instead of `load`.
+ The former does not have the optional argument. [Fix GH-779]
+
Tue Dec 9 10:16:24 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (rb_frame_last_func): return the most recent frame method
diff --git a/vm_eval.c b/vm_eval.c
index 1a6f49b08c..49ca9d4191 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -1442,7 +1442,7 @@ rb_eval_string_protect(const char *str, int *state)
/**
* Evaluates the given string under a module binding in an isolated binding.
- * This is same as the binding for required libraries on "require('foo', true)".
+ * This is same as the binding for loaded libraries on "load('foo', true)".
*
* __FILE__ will be "(eval)", and __LINE__ starts from 1 in the evaluation.
*