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)
diff --git a/src/misc1.c b/src/misc1.c
index 7ba3972..988e368 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -6635,6 +6635,7 @@
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 @@
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 @@
}
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
{
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
Binary files differ
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(void)
+{
+ /* Make sure that cino=X0s is not parsed like cino=Xs. */
+ if (cond)
+ foo();
+ else
+ {
+ bar();
+ }
+}
+
+
{
do
{
diff --git a/src/version.c b/src/version.c
index e9f1607..1e5d5cd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 549,
+/**/
548,
/**/
547,