Branch: refs/heads/master Author: Colomban Wendling ban@herbesfolles.org Committer: Colomban Wendling ban@herbesfolles.org Date: Wed, 01 Aug 2018 12:53:30 UTC Commit: ea47c6c713493c7b0c358a39b51da76e3af2d2a0 https://github.com/geany/geany/commit/ea47c6c713493c7b0c358a39b51da76e3af2d2...

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

The new styles are for "diff of a diff", e.g. lines starting with `++`, `+-`, `-+` and `--`. Those are currently mapped conservatively keeping the previous display behavior, until we have good style matches for them.

Modified Paths: -------------- data/filedefs/filetypes.diff src/highlightingmappings.h

Modified: data/filedefs/filetypes.diff 8 lines changed, 8 insertions(+), 0 deletions(-) =================================================================== @@ -9,6 +9,14 @@ position=number deleted=line_removed added=line_added changed=line_changed +# '++' lines +patch_add=line_added +# '+-' lines +patch_delete=line_added +# '-+' lines +removed_patch_add=line_removed +# '--' lines +removed_patch_delete=line_removed

[settings]

Modified: src/highlightingmappings.h 20 lines changed, 12 insertions(+), 8 deletions(-) =================================================================== @@ -478,14 +478,18 @@ static const HLKeyword highlighting_keywords_D[] = #define highlighting_lexer_DIFF SCLEX_DIFF static const HLStyle highlighting_styles_DIFF[] = { - { SCE_DIFF_DEFAULT, "default", FALSE }, - { SCE_DIFF_COMMENT, "comment", FALSE }, - { SCE_DIFF_COMMAND, "command", FALSE }, - { SCE_DIFF_HEADER, "header", FALSE }, - { SCE_DIFF_POSITION, "position", FALSE }, - { SCE_DIFF_DELETED, "deleted", FALSE }, - { SCE_DIFF_ADDED, "added", FALSE }, - { SCE_DIFF_CHANGED, "changed", FALSE } + { SCE_DIFF_DEFAULT, "default", FALSE }, + { SCE_DIFF_COMMENT, "comment", FALSE }, + { SCE_DIFF_COMMAND, "command", FALSE }, + { SCE_DIFF_HEADER, "header", FALSE }, + { SCE_DIFF_POSITION, "position", FALSE }, + { SCE_DIFF_DELETED, "deleted", FALSE }, + { SCE_DIFF_ADDED, "added", FALSE }, + { SCE_DIFF_CHANGED, "changed", FALSE }, + { SCE_DIFF_PATCH_ADD, "patch_add", FALSE }, + { SCE_DIFF_PATCH_DELETE, "patch_delete", FALSE }, + { SCE_DIFF_REMOVED_PATCH_ADD, "removed_patch_add", FALSE }, + { SCE_DIFF_REMOVED_PATCH_DELETE, "removed_patch_delete", FALSE } }; #define highlighting_keywords_DIFF EMPTY_KEYWORDS #define highlighting_properties_DIFF EMPTY_PROPERTIES

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