From e32d5ec88e16a17205af5cc8b8f987a34c6a23ac Mon Sep 17 00:00:00 2001
From: Justin Frank <justinpfrank@protonmail.com>
Date: Fri, 14 Sep 2018 19:03:49 -0700
Subject: [PATCH 1/2] tweaked some of the c-family highlighting of defines

---
 rc/core/c-family.kak | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/rc/core/c-family.kak b/rc/core/c-family.kak
index 19d9750b..3fe07b84 100644
--- a/rc/core/c-family.kak
+++ b/rc/core/c-family.kak
@@ -143,12 +143,13 @@ evaluate-commands %sh{
             add-highlighter shared/FT/string region %{MAYBEAT(?<!QUOTE)(?<!QUOTE\\)"} %{(?<!\\)(?:\\\\)*"} fill string
             add-highlighter shared/FT/raw_string region %{R"([^(]*)\(} %{\)([^")]*)"} fill string
             add-highlighter shared/FT/comment region /\* \*/ fill comment
-            add-highlighter shared/FT/line_comment region // $ fill comment
+            add-highlighter shared/FT/line_comment region // (?<!\\)(?=\n) fill comment
             add-highlighter shared/FT/disabled region -recurse "#\h*if(?:def)?" ^\h*?#\h*if\h+(?:0|FALSE)\b "#\h*(?:else|elif|endif)" fill rgb:666666
-            add-highlighter shared/FT/macro region %{^\h*?\K#} %{(?<!\\)\n} group
+            add-highlighter shared/FT/macro region %{^\h*?\K#} %{(?<!\\)(?=\n)} group
 
             add-highlighter shared/FT/macro/ fill meta
             add-highlighter shared/FT/macro/ regex ^\h*#include\h+(\S*) 1:module
+            add-highlighter shared/FT/macro/ regex /\*.*?\*/ 0:comment
             ' | sed -e "s/FT/${ft}/g; s/QUOTE/'/g; s/MAYBEAT/${maybe_at}/;"
     done
 }

From 4bb87ef430800d9fa6ceed8575184ec6b99b14b2 Mon Sep 17 00:00:00 2001
From: Justin Frank <justinpfrank@protonmail.com>
Date: Sat, 15 Sep 2018 10:52:18 -0700
Subject: [PATCH 2/2] macros always end at the start of a line comment

---
 rc/core/c-family.kak | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rc/core/c-family.kak b/rc/core/c-family.kak
index 3fe07b84..734e6643 100644
--- a/rc/core/c-family.kak
+++ b/rc/core/c-family.kak
@@ -145,7 +145,7 @@ evaluate-commands %sh{
             add-highlighter shared/FT/comment region /\* \*/ fill comment
             add-highlighter shared/FT/line_comment region // (?<!\\)(?=\n) fill comment
             add-highlighter shared/FT/disabled region -recurse "#\h*if(?:def)?" ^\h*?#\h*if\h+(?:0|FALSE)\b "#\h*(?:else|elif|endif)" fill rgb:666666
-            add-highlighter shared/FT/macro region %{^\h*?\K#} %{(?<!\\)(?=\n)} group
+            add-highlighter shared/FT/macro region %{^\h*?\K#} %{(?<!\\)(?=\n)|(?=//)} group
 
             add-highlighter shared/FT/macro/ fill meta
             add-highlighter shared/FT/macro/ regex ^\h*#include\h+(\S*) 1:module