From 9c964e97f000271d73b6a16f4692e72aeeb3e277 Mon Sep 17 00:00:00 2001
From: Maxime Coste <mawww@kakoune.org>
Date: Tue, 14 Nov 2017 11:45:30 +0800
Subject: [PATCH] c-family.kak: Highlight character literals later

That way it overrides integer literal highlighters in the case where
they conflict.
---
 rc/core/c-family.kak | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rc/core/c-family.kak b/rc/core/c-family.kak
index 1ab0fcc9..aa5b4ca0 100644
--- a/rc/core/c-family.kak
+++ b/rc/core/c-family.kak
@@ -179,9 +179,6 @@ add-highlighter shared/c/code regex %{\b-?(0x[0-9a-fA-F]+|\d+)[fdiu]?|'((\\.)?|[
 
 # c++ specific
 
-# character literals (no multi-character literals)
-add-highlighter shared/cpp/code regex %{(\b(u8|u|U|L)|\B)'((\\.)|[^'\\])'\B} 0:value
-
 # integer literals
 add-highlighter shared/cpp/code regex %{(?i)(?<!\.)\b[1-9]('?\d+)*(ul?l?|ll?u?)?\b(?!\.)} 0:value
 add-highlighter shared/cpp/code regex %{(?i)(?<!\.)\b0b[01]('?[01]+)*(ul?l?|ll?u?)?\b(?!\.)} 0:value
@@ -196,6 +193,9 @@ add-highlighter shared/cpp/code regex %{(?i)(?<!\.)\b0x[\da-f]('?[\da-f]+)*\.([f
 add-highlighter shared/cpp/code regex %{(?i)(?<!\.)\b0x[\da-f]('?[\da-f]+)*\.?p[+-]?\d('?\d+)*)?[fl]?\b(?!\.)} 0:value
 add-highlighter shared/cpp/code regex %{(?i)(?<!\.)\b0x([\da-f]('?[\da-f]+)*)?\.\d('?[\d]+)*(p[+-]?\d('?\d+)*)?[fl]?\b(?!\.)} 0:value
 
+# character literals (no multi-character literals)
+add-highlighter shared/cpp/code regex %{(\b(u8|u|U|L)|\B)'((\\.)|[^'\\])'\B} 0:value
+
 %sh{
     # Grammar
     keywords="alignas alignof and and_eq asm bitand bitor break case catch