updated for version 7.3.549

Problem:    In 'cinoptions' "0s" is interpreted as one shiftwidth. (David
            Pineau)
Solution:   Use the zero as zero. (Lech Lorens)

src/misc1.c

@@ -6635,6 +6635,7 @@ get_c_indent()
     int		whilelevel;
     linenr_T	lnum;
     char_u	*options;
+    char_u	*digits;
     int		fraction = 0;	    /* init for GCC */
     int		divider;
     int		n;
@@ -6650,6 +6651,7 @@ get_c_indent()
 	l = options++;
 	if (*options == '-')
 	    ++options;
+	digits = options;	    /* remember where the digits start */
 	n = getdigits(&options);
 	divider = 0;
 	if (*options == '.')	    /* ".5s" means a fraction */
@@ -6666,7 +6668,7 @@ get_c_indent()
 	}
 	if (*options == 's')	    /* "2s" means two times 'shiftwidth' */
 	{
-	    if (n == 0 && fraction == 0)
+	    if (options == digits)
 		n = curbuf->b_p_sw;	/* just "s" is one 'shiftwidth' */
 	    else
 	    {

src/ops.c

@@ -4306,7 +4306,7 @@ do_join(count, insert_space, save_undo, use_formatoptions)
     colnr_T	col = 0;
     int		ret = OK;
 #if defined(FEAT_COMMENTS) || defined(PROTO)
-    int		*comments;
+    int		*comments = NULL;
     int		remove_comments = (use_formatoptions == TRUE)
 				  && has_format_option(FO_REMOVE_COMS);
     int		prev_was_comment;
@@ -4352,7 +4352,7 @@ do_join(count, insert_space, save_undo, use_formatoptions)
 
 		char_u *new_curr = skip_comment(curr, TRUE, insert_space,
 							   &prev_was_comment);
-		comments[t] = new_curr - curr;
+		comments[t] = (int)(new_curr - curr);
 		curr = new_curr;
 	    }
 	    else

src/screen.c

@@ -3228,8 +3228,7 @@ win_line(wp, lnum, startrow, endrow, nochange)
 		/* no bad word found at line start, don't check until end of a
 		 * word */
 		spell_hlf = HLF_COUNT;
-		word_end = (int)(spell_to_word_end(ptr, wp)
-								  - line + 1);
+		word_end = (int)(spell_to_word_end(ptr, wp) - line + 1);
 	    }
 	    else
 	    {

src/testdir/test3.in

@@ -975,6 +975,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=

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
 	{

src/version.c

@@ -714,6 +714,14 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    549,
+/**/
+    548,
+/**/
+    547,
+/**/
+    546,
 /**/
     545,
 /**/