summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--array.c8
-rw-r--r--dir.c2
3 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 29294668bc..6a380d8aff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Nov 11 17:58:19 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * dir.c (rb_glob): should have called rb_glob_caller().
+ [ruby-dev:24773]
+
Thu Nov 11 16:56:10 2004 NAKAMURA Usaku <usa@ruby-lang.org>
* test/ruby/test_file.rb (test_truncate_wbuf): we want to test
diff --git a/array.c b/array.c
index ec8a06a20a..8b9c62063a 100644
--- a/array.c
+++ b/array.c
@@ -1148,9 +1148,8 @@ rb_ary_update(ary, beg, len, rpl)
* the current capacity of the array, the array grows
* automatically. A negative indices will count backward
* from the end of the array. Inserts elements if _length_ is
- * zero. If +nil+ is used in the second and third form,
- * deletes elements from _self_. An +IndexError+ is raised if a
- * negative index points past the beginning of the array. See also
+ * zero. An +IndexError+ is raised if a negative index points
+ * past the beginning of the array. See also
* <code>Array#push</code>, and <code>Array#unshift</code>.
*
* a = Array.new
@@ -1160,7 +1159,8 @@ rb_ary_update(ary, beg, len, rpl)
* a[0, 2] = "?" #=> ["?", 2, nil, "4"]
* a[0..2] = "A" #=> ["A", "4"]
* a[-1] = "Z" #=> ["A", "Z"]
- * a[1..-1] = nil #=> ["A"]
+ * a[1..-1] = nil #=> ["A", nil]
+ * a[1..-1] = [] #=> ["A"]
*/
static VALUE
diff --git a/dir.c b/dir.c
index 1e03d412f9..970d13edcb 100644
--- a/dir.c
+++ b/dir.c
@@ -1410,7 +1410,7 @@ rb_glob(path, func, arg)
args.func = func;
args.arg = arg;
- status = rb_glob2(rb_str_new2(path), 0, func, &args);
+ status = rb_glob2(rb_str_new2(path), 0, rb_glob_caller, &args);
if (status) rb_jump_tag(status);
}