2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 55238ee24..f23954b81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Dec 22 10:59:31 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_upto): should return enumerator if called
+	  without block.  [ruby-dev:37526]
+
 Mon Dec 22 09:54:43 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* parse.y (gettable_gen): the encoding of __FILE__ should be
diff --git a/string.c b/string.c
index d34a1e861..9db82d4a2 100644
--- a/string.c
+++ b/string.c
@@ -2861,6 +2861,7 @@ rb_str_upto(int argc, VALUE *argv, VALUE beg)
     rb_encoding *enc;
 
     rb_scan_args(argc, argv, "11", &end, &exclusive);
+    RETURN_ENUMERATOR(beg, argc, argv);
     excl = RTEST(exclusive);
     CONST_ID(succ, "succ");
     StringValue(end);