diff --git a/src/cindent.c b/src/cindent.c
index f2f2ac0c10..e23f96d453 100644
--- a/src/cindent.c
+++ b/src/cindent.c
@@ -3476,7 +3476,7 @@ get_c_indent(void)
 			    amount = cur_amount;
 
 			    n = (int)STRLEN(l);
-			    if (terminated == ',' && (*skipwhite(l) == ']'
+			    if (curbuf->b_ind_js && terminated == ',' && (*skipwhite(l) == ']'
 					|| (n >=2 && l[n - 2] == ']')))
 				break;
 
diff --git a/src/testdir/test_cindent.vim b/src/testdir/test_cindent.vim
index d27adbc4b5..589fcdd61f 100644
--- a/src/testdir/test_cindent.vim
+++ b/src/testdir/test_cindent.vim
@@ -1106,6 +1106,11 @@ def Test_cindent_1()
   }
   }
 
+  void foo() {
+  float a[5],
+  b;
+  }
+
   /* end of AUTO */
   [CODE]
 
@@ -2083,6 +2088,11 @@ def Test_cindent_1()
   	}
   }
 
+  void foo() {
+  	float a[5],
+  		  b;
+  }
+
   /* end of AUTO */
 
   [CODE]
diff --git a/src/version.c b/src/version.c
index 0ce44e9d46..13aa6ec436 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1877,
 /**/
     1876,
 /**/