merges r20906 from trunk into ruby_1_9_1.

* string.c (rb_str_upto): should return enumerator if called
  without block.  [ruby-dev:37526]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20995 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 0 deletions

diff --git a/string.c b/string.c
index e0efa0477..c1f14a852 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);