Branch: refs/heads/master Author: Colomban Wendling ban@herbesfolles.org Committer: Colomban Wendling ban@herbesfolles.org Date: Sat, 27 Apr 2013 16:30:17 UTC Commit: 564ef98f9cd6bef30798f9688cd264f3387c445d https://github.com/geany/geany/commit/564ef98f9cd6bef30798f9688cd264f3387c44...
Log Message: ----------- Update for new Scintilla styles
Modified Paths: -------------- data/filetypes.haskell src/highlighting.c src/highlightingmappings.h
Modified: data/filetypes.haskell 2 files changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -18,6 +18,8 @@ instance=type capital=string_2 module=function data=number_2 +pragma=preprocessor +preprocessor=preprocessor
[keywords] # all items must be in one line
Modified: src/highlighting.c 5 files changed, 5 insertions(+), 0 deletions(-) =================================================================== @@ -1735,6 +1735,11 @@ gboolean highlighting_is_code_style(gint lexer, gint style) if (style == SCE_C_PREPROCESSOR) return FALSE; break; + + case SCLEX_HASKELL: + if (style == SCE_HA_PREPROCESSOR) + return FALSE; + break; } return !(highlighting_is_comment_style(lexer, style) || highlighting_is_string_style(lexer, style));
Modified: src/highlightingmappings.h 4 files changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -610,7 +610,9 @@ { SCE_HA_INSTANCE, "instance", FALSE }, { SCE_HA_CAPITAL, "capital", FALSE }, { SCE_HA_MODULE, "module", FALSE }, - { SCE_HA_DATA, "data", FALSE } + { SCE_HA_DATA, "data", FALSE }, + { SCE_HA_PRAGMA, "pragma", FALSE }, + { SCE_HA_PREPROCESSOR, "preprocessor", FALSE } }; static const HLKeyword highlighting_keywords_HASKELL[] = {
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).