* re.c (rb_reg_initialize_m): 3rd argument was ignored.

* string.c (rb_str_count): return 0 for empty string (was
  returning nil).


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3449 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 1 deletions

diff --git a/string.c b/string.c
index d2fdc44806..0cadd61fe2 100644
--- a/string.c
+++ b/string.c
@@ -2478,7 +2478,7 @@ rb_str_count(argc, argv, str)
     }
 
     s = RSTRING(str)->ptr;
-    if (!s || RSTRING(str)->len == 0) return Qnil;
+    if (!s || RSTRING(str)->len == 0) return INT2FIX(0);
     send = s + RSTRING(str)->len;
     i = 0;
     while (s < send) {