[geany/geany] 67329f: Update for new Scintilla styles

[Colomban Wendling]

Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Sat, 17 May 2014 20:17:44 UTC
Commit:      67329f2b9860a970cf9afe6bf85b25ef7402df6e
             https://github.com/geany/geany/commit/67329f2b9860a970cf9afe6bf85b25ef7402df6e

Log Message:
-----------
Update for new Scintilla styles

The new C styles escapesequence and taskmarker are currently mapped
conservatively, and may benefit from a more visible mapping.


Modified Paths:
--------------
    data/filetypes.c
    src/highlighting.c
    src/highlightingmappings.h

Modified: data/filetypes.c
2 lines changed, 2 insertions(+), 0 deletions(-)
===================================================================
@@ -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


Modified: src/highlighting.c
6 lines changed, 4 insertions(+), 2 deletions(-)
===================================================================
@@ -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 ||


Modified: src/highlightingmappings.h
4 lines changed, 3 insertions(+), 1 deletions(-)
===================================================================
@@ -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[] =
 {



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).