diff --git a/src/misc1.c b/src/misc1.c
index 7ba3972..d884988 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -6647,9 +6647,12 @@ get_c_indent()
 
     for (options = curbuf->b_p_cino; *options; )
     {
+	char_u *digits;
+
 	l = options++;
 	if (*options == '-')
 	    ++options;
+	digits = options;
 	n = getdigits(&options);
 	divider = 0;
 	if (*options == '.')	    /* ".5s" means a fraction */
@@ -6666,7 +6669,7 @@ get_c_indent()
 	}
 	if (*options == 's')	    /* "2s" means two times 'shiftwidth' */
 	{
-	    if (n == 0 && fraction == 0)
+	    if (digits == options)
 		n = curbuf->b_p_sw;	/* just "s" is one 'shiftwidth' */
 	    else
 	    {
diff --git a/src/testdir/test3.in b/src/testdir/test3.in
index 67fc131..abb7750 100644
--- a/src/testdir/test3.in
+++ b/src/testdir/test3.in
@@ -977,6 +977,24 @@ main ( int first_par, /*
 
 STARTTEST
 :set cin
+:set cino=es,n0s
+/main
+=][
+ENDTEST
+
+main(void)
+{
+	/* Make sure that cino=X0s is not parsed like cino=Xs. */
+	if (cond)
+		foo();
+	else
+	{
+		bar();
+	}
+}
+
+STARTTEST
+:set cin
 :set cino=
 ]]=][
 ENDTEST
diff --git a/src/testdir/test3.ok b/src/testdir/test3.ok
index 72cb75f..011751b 100644
--- a/src/testdir/test3.ok
+++ b/src/testdir/test3.ok
@@ -940,6 +940,18 @@ main ( int first_par, /*
 }
 
 
+main(void)
+{
+	/* Make sure that cino=X0s is not parsed like cino=Xs. */
+	if (cond)
+		foo();
+	else
+	{
+		bar();
+	}
+}
+
+
 {
 	do
 	{