updated for version 7.3.332

Problem:    Indent after "public:" is not increased in C++ code. (Lech Lorens)
Solution:   Check for namespace after the regular checks. (partly by Martin
            Gieseking)

src/misc1.c

@@ -6389,6 +6389,7 @@ get_c_indent()
     int		lookfor_cpp_namespace = FALSE;
     int		cont_amount = 0;    /* amount for continuation line */
     int		original_line_islabel;
+    int		added_to_amount = 0;
 
     for (options = curbuf->b_p_cino; *options; )
     {
@@ -7216,8 +7217,25 @@ get_c_indent()
 			else
 			    amount += ind_continuation;
 		    }
-		    else if (lookfor_cpp_namespace)
+		    else
 		    {
+			if (lookfor != LOOKFOR_TERM
+					  && lookfor != LOOKFOR_CPP_BASECLASS)
+			{
+			    amount = scope_amount;
+			    if (theline[0] == '{')
+			    {
+				amount += ind_open_extra;
+				added_to_amount = ind_open_extra;
+			    }
+			}
+
+			if (lookfor_cpp_namespace)
+			{
+			    /*
+			     * Looking for C++ namespace, need to look further
+			     * back.
+			     */
 			    if (curwin->w_cursor.lnum == ourscope)
 				continue;
 
@@ -7228,10 +7246,8 @@ get_c_indent()
 
 			    l = ml_get_curline();
 
-			/*
+			    /* If we're in a comment now, skip to the start of
-			 * If we're in a comment now, skip to the start of the
+			     * the comment. */
-			 * comment.
-			 */
 			    trypos = find_start_comment(ind_maxcomment);
 			    if (trypos != NULL)
 			    {
@@ -7240,28 +7256,20 @@ get_c_indent()
 				continue;
 			    }
 
-			/*
+			    /* Skip preprocessor directives and blank lines. */
-			 * Skip preprocessor directives and blank lines.
-			 */
 			    if (cin_ispreproc_cont(&l, &curwin->w_cursor.lnum))
 				continue;
 
+			    /* Finally the actual check for "namespace". */
 			    if (cin_is_cpp_namespace(l))
 			    {
-			    amount += ind_cpp_namespace;
+				amount += ind_cpp_namespace - added_to_amount;
 				break;
 			    }
 
 			    if (cin_nocode(l))
 				continue;
-
 			}
-		    else if (lookfor != LOOKFOR_TERM
-					  && lookfor != LOOKFOR_CPP_BASECLASS)
-		    {
-			amount = scope_amount;
-			if (theline[0] == '{')
-			    amount += ind_open_extra;
 		    }
 		    break;
 		}

src/testdir/test3.in

@@ -1308,6 +1308,20 @@ protected:
    void testfall();
 };
 
+STARTTEST
+:set cino=(0,gs,hs
+2kdd]]=][
+ENDTEST
+
+class Foo : public Bar
+{
+public:
+virtual void method1(void) = 0;
+virtual void method2(int arg1,
+int arg2,
+int arg3) = 0;
+};
+
 STARTTEST
 :set cino=+20
 2kdd]]=][

src/testdir/test3.ok

@@ -1190,6 +1190,16 @@ protected:
 };
 
 
+class Foo : public Bar
+{
+	public:
+		virtual void method1(void) = 0;
+		virtual void method2(int arg1,
+							 int arg2,
+							 int arg3) = 0;
+};
+
+
 	void
 foo()
 {

src/version.c

@@ -709,6 +709,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    332,
 /**/
     331,
 /**/