Branch: refs/heads/master Author: Colomban Wendling ban@herbesfolles.org Committer: Colomban Wendling ban@herbesfolles.org Date: Tue, 26 Jun 2012 21:26:30 Commit: 298ce94c5ddc352a19a89dddcadc23bd3aed631b https://github.com/geany/geany/commit/298ce94c5ddc352a19a89dddcadc23bd3aed63...
Log Message: ----------- Update for new Scintilla styles
Modified Paths: -------------- data/filetypes.c data/filetypes.css src/highlighting.c src/highlightingmappings.h
Modified: data/filetypes.c 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -23,6 +23,7 @@ globalclass=class # """verbatim""" tripleverbatim=string_2 +hashquotedstring=string_2
[keywords] # all items must be in one line
Modified: data/filetypes.css 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -16,6 +16,7 @@ attribute=attribute value=value id=number identifier2=keyword_2 +variable=identifier_1 important=extra directive=preprocessor identifier3=keyword_3
Modified: src/highlighting.c 3 files changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1402,7 +1402,8 @@ gboolean highlighting_is_string_style(gint lexer, gint style) style == SCE_C_STRINGEOL || style == SCE_C_STRINGRAW || style == SCE_C_VERBATIM || - style == SCE_C_TRIPLEVERBATIM); + style == SCE_C_TRIPLEVERBATIM || + style == SCE_C_HASHQUOTEDSTRING);
case SCLEX_PASCAL: return (style == SCE_PAS_CHARACTER ||
Modified: src/highlightingmappings.h 2 files changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -194,6 +194,7 @@ /* triple verbatims use the same style */ { SCE_C_TRIPLEVERBATIM, "verbatim", FALSE }, { SCE_C_REGEX, "regex", FALSE }, + { SCE_C_HASHQUOTEDSTRING, "hashquotedstring", FALSE }, { SCE_C_COMMENTLINEDOC, "commentlinedoc", FALSE }, { SCE_C_COMMENTDOCKEYWORD, "commentdockeyword", FALSE }, { SCE_C_COMMENTDOCKEYWORDERROR, "commentdockeyworderror", FALSE }, @@ -291,6 +292,7 @@ { SCE_CSS_VALUE, "value", FALSE }, { SCE_CSS_ID, "id", FALSE }, { SCE_CSS_IDENTIFIER2, "identifier2", FALSE }, + { SCE_CSS_VARIABLE, "variable", FALSE }, { SCE_CSS_IMPORTANT, "important", FALSE }, { SCE_CSS_DIRECTIVE, "directive", FALSE }, { SCE_CSS_IDENTIFIER3, "identifier3", FALSE },
@@ Diff output truncated at 100000 characters. @@
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).