Improve C indentation support around namespace/struct closing bracket

rc/core/c-family.kak

@@ -68,12 +68,12 @@ def -hidden _c-family-indent-on-opening-curly-brace %[
 
 def -hidden _c-family-indent-on-closing-curly-brace %[
     # align to opening curly brace when alone on a line
-    try %[ exec -itersel -draft <a-h><a-k>^\h+\}$<ret>hms\`|.\'<ret>1<a-&> ]
+    try %[ exec -itersel -draft <a-h><a-:><a-k>^\h+\}$<ret>hms\`|.\'<ret>1<a-&> ]
 ]
 
 def -hidden _c-family-insert-on-closing-curly-brace %[
     # add a semicolon after a closing brace if part of a class, union or struct definition
-    try %[ exec -itersel -draft hm<a-x>B<a-x><a-k>^\h*(class|struct|union)<ret> a\;<esc> ]
+    try %[ exec -itersel -draft hm<a-x>B<a-x><a-k>\`\h*(class|struct|union)<ret> a\;<esc> ]
 ]
 
 def -hidden _c-family-insert-on-newline %[ eval -draft %[

test/indent/c-family/close-namespace/cmd

@@ -0,0 +1 @@
+a<ret>}<esc>

test/indent/c-family/close-namespace/in

@@ -0,0 +1,3 @@
+namespace A
+{
+    struct B%(;)

test/indent/c-family/close-namespace/out

@@ -0,0 +1,4 @@
+namespace A
+{
+    struct B;
+}

test/indent/c-family/close-namespace/rc

@@ -0,0 +1,3 @@
+source "%val{runtime}/colors/default.kak"
+source "%val{runtime}/rc/core/c-family.kak"
+set buffer filetype cpp

test/indent/c-family/close-struct/cmd

@@ -0,0 +1 @@
+a<ret>}<esc>

test/indent/c-family/close-struct/in

@@ -0,0 +1,3 @@
+struct A
+{
+    int i%(;)

test/indent/c-family/close-struct/out

@@ -0,0 +1,4 @@
+struct A
+{
+    int i;
+};

test/indent/c-family/close-struct/rc

@@ -0,0 +1,3 @@
+source "%val{runtime}/colors/default.kak"
+source "%val{runtime}/rc/core/c-family.kak"
+set buffer filetype cpp