patch 7.4.912v7.4.912

Problem:    Wrong indenting for C++ constructor.
Solution:   Recognize ::.  (Anhong)

4 files changed, 29 insertions, 0 deletions

diff --git a/src/misc1.c b/src/misc1.c
index fa1e049d31..5190db4a13 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -6250,6 +6250,19 @@ cin_isfuncdecl(sp, first_lnum, min_lnum)
     {
 	if (cin_iscomment(s))	/* ignore comments */
 	    s = cin_skipcomment(s);
+	else if (*s == ':')
+	{
+	    if (*(s + 1) == ':')
+		s += 2;
+	    else
+		/* To avoid a mistake in the following situation:
+		 * A::A(int a, int b)
+		 *     : a(0)  // <--not a function decl
+		 *     , b(0)
+		 * {...
+		 */
+		return FALSE;
+	}
 	else
 	    ++s;
     }
diff --git a/src/testdir/test3.in b/src/testdir/test3.in
index f3d4f182f8..c0a68d0941 100644
--- a/src/testdir/test3.in
+++ b/src/testdir/test3.in
@@ -663,6 +663,13 @@ Constructor::Constructor(int a,
 {
 }
 
+A::A(int a, int b)
+: aa(a),
+bb(b),
+cc(c)
+{
+}
+
 class CAbc :
    public BaseClass1,
    protected BaseClass2
diff --git a/src/testdir/test3.ok b/src/testdir/test3.ok
index 477aacc1ca..c4c01a3d4f 100644
--- a/src/testdir/test3.ok
+++ b/src/testdir/test3.ok
@@ -651,6 +651,13 @@ Constructor::Constructor(int a,
 {
 }
 
+A::A(int a, int b)
+	: aa(a),
+	bb(b),
+	cc(c)
+{
+}
+
 class CAbc :
 	public BaseClass1,
 	protected BaseClass2
diff --git a/src/version.c b/src/version.c
index 734f84f3c6..a0896f8d90 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    912,
+/**/
     911,
 /**/
     910,