From d1b15dec4d00d7ed5e92ff4e0fb7fc2e0818e479 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 13 Oct 2015 16:13:39 +0200
Subject: patch 7.4.893 Problem:    C indenting is wrong below a "case (foo):"
 because it is             recognized as a C++ base class construct.  Issue
 #38. Solution:   Check for the case keyword.

---
 src/misc1.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'src/misc1.c')

diff --git a/src/misc1.c b/src/misc1.c
index 60e814694..aacf610ad 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -6555,7 +6555,7 @@ cin_is_cpp_baseclass(cached)
 
     pos->lnum = lnum;
     line = ml_get(lnum);
-    s = cin_skipcomment(line);
+    s = line;
     for (;;)
     {
 	if (*s == NUL)
@@ -6564,6 +6564,13 @@ cin_is_cpp_baseclass(cached)
 		break;
 	    /* Continue in the cursor line. */
 	    line = ml_get(++lnum);
+	    s = line;
+	}
+	if (s == line)
+	{
+	    /* don't recognize "case (foo):" as a baseclass */
+	    if (cin_iscase(s, FALSE))
+		break;
 	    s = cin_skipcomment(line);
 	    if (*s == NUL)
 		continue;
-- 
cgit v1.2.1