From 67329f2b9860a970cf9afe6bf85b25ef7402df6e Mon Sep 17 00:00:00 2001
From: Colomban Wendling <ban@herbesfolles.org>
Date: Sat, 17 May 2014 22:17:44 +0200
Subject: [PATCH] Update for new Scintilla styles

The new C styles escapesequence and taskmarker are currently mapped
conservatively, and may benefit from a more visible mapping.
---
 data/filetypes.c           | 2 ++
 src/highlighting.c         | 6 ++++--
 src/highlightingmappings.h | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/data/filetypes.c b/data/filetypes.c
index c5d1c6826..f7a8ad891 100644
--- a/data/filetypes.c
+++ b/data/filetypes.c
@@ -28,6 +28,8 @@ globalclass=class
 # """verbatim"""
 tripleverbatim=string_2
 hashquotedstring=string_2
+taskmarker=comment
+escapesequence=string_1
 
 [keywords]
 # all items must be in one line
diff --git a/src/highlighting.c b/src/highlighting.c
index dab8820eb..c09a2b2a0 100644
--- a/src/highlighting.c
+++ b/src/highlighting.c
@@ -1402,7 +1402,8 @@ gboolean highlighting_is_string_style(gint lexer, gint style)
 				style == SCE_C_STRINGRAW ||
 				style == SCE_C_VERBATIM ||
 				style == SCE_C_TRIPLEVERBATIM ||
-				style == SCE_C_HASHQUOTEDSTRING);
+				style == SCE_C_HASHQUOTEDSTRING ||
+				style == SCE_C_ESCAPESEQUENCE);
 
 		case SCLEX_PASCAL:
 			return (style == SCE_PAS_CHARACTER ||
@@ -1576,7 +1577,8 @@ gboolean highlighting_is_comment_style(gint lexer, gint style)
 				style == SCE_C_PREPROCESSORCOMMENTDOC ||
 				style == SCE_C_COMMENTLINEDOC ||
 				style == SCE_C_COMMENTDOCKEYWORD ||
-				style == SCE_C_COMMENTDOCKEYWORDERROR);
+				style == SCE_C_COMMENTDOCKEYWORDERROR ||
+				style == SCE_C_TASKMARKER);
 
 		case SCLEX_PASCAL:
 			return (style == SCE_PAS_COMMENT ||
diff --git a/src/highlightingmappings.h b/src/highlightingmappings.h
index ecab17bd9..898578f95 100644
--- a/src/highlightingmappings.h
+++ b/src/highlightingmappings.h
@@ -253,7 +253,9 @@ static const HLStyle highlighting_styles_C[] =
 	{ SCE_C_COMMENTDOCKEYWORD,		"commentdockeyword",		FALSE },
 	{ SCE_C_COMMENTDOCKEYWORDERROR,	"commentdockeyworderror",	FALSE },
 	/* used for local structs and typedefs */
-	{ SCE_C_GLOBALCLASS,			"globalclass",				FALSE }
+	{ SCE_C_GLOBALCLASS,			"globalclass",				FALSE },
+	{ SCE_C_TASKMARKER,				"taskmarker",				FALSE },
+	{ SCE_C_ESCAPESEQUENCE,			"escapesequence",			FALSE }
 };
 static const HLKeyword highlighting_keywords_C[] =
 {
-- 
2.11.4.GIT