* 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: http://svn.ruby-lang.org/repos/ruby/trunk@3449 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 1 deletions

diff --git a/re.c b/re.c
index 830a22773..b837da8c3 100644
--- a/re.c
+++ b/re.c
@@ -1265,7 +1265,7 @@ rb_reg_initialize_m(argc, argv, self)
 	    if (FIXNUM_P(argv[1])) flags = FIX2INT(argv[1]);
 	    else if (RTEST(argv[1])) flags = RE_OPTION_IGNORECASE;
 	}
-	else if (argc == 3) {
+	if (argc == 3) {
 	    char *kcode = StringValuePtr(argv[2]);
 
 	    switch (kcode[0]) {