summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-02-23 01:58:01 +0000
committerdrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-02-23 01:58:01 +0000
commit8a5b4ad1153ee725e30030963aa7787e683a8922 (patch)
tree3771a96251e53be36289d17bac7b6a70b3dd970e
parent5afb4b7b29878d3485beec300d690f9da2cdd4ee (diff)
downloadbundler-8a5b4ad1153ee725e30030963aa7787e683a8922.tar.gz
* load.c (rb_f_require): Add note to require for scope of items in the
loaded file. [ruby-trunk - #5910] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34758 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--load.c5
2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 1450b9cb79..2194736204 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Feb 23 09:57:21 2012 Eric Hodel <drbrain@segment7.net>
+
+ * load.c (rb_f_require): Add note to require for scope of items in the
+ loaded file. [ruby-trunk - #5910]
+
Thu Feb 23 03:58:08 2012 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
* lib/ostruct.rb (delete_field): Bug fix so previous value is
diff --git a/load.c b/load.c
index d36285fc38..cddd7255ac 100644
--- a/load.c
+++ b/load.c
@@ -469,6 +469,11 @@ load_unlock(const char *ftptr, int done)
*
* require "my-library.rb"
* require "db-driver"
+ *
+ * Any constants or globals within the loaded source file will be available
+ * in the calling program's global namespace. However, local variables will
+ * not be propagated to the loading environment.
+ *
*/
VALUE