diff --git a/ChangeLog b/ChangeLog
index b1e80dab43..84c14a2a2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Dec 25 15:55:14 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_succ): fix for string with non-alphanumeric chars.
+
 Tue Dec 25 15:42:49 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* io.c (rb_io_external_encoding): should return nil for
diff --git a/string.c b/string.c
index 6ca4ba3c63..7c49b34630 100644
--- a/string.c
+++ b/string.c
@@ -1886,16 +1886,13 @@ rb_str_succ(VALUE orig)
 	    }
 	    n = s - sbeg;
 	}
-	else {
-	    break;
-	}
     }
     if (c == -1) {		/* str contains no alnum */
 	c = '\001';
 	s = e;
 	while ((s = rb_enc_prev_char(sbeg, s, enc)) != 0) {
 	    int limit = 256;
-	    if (cc == 0) cc = rb_enc_codepoint(s, e, enc);
+	    cc = rb_enc_codepoint(s, e, enc);
 	    while ((l = rb_enc_mbcput(++cc, carry, enc)) < 0 && --limit);
 	    if (l > 0) {
 		if (l == (o = e - s)) goto overlay;