Branch: refs/heads/master Author: Colomban Wendling ban@herbesfolles.org Committer: Colomban Wendling ban@herbesfolles.org Date: Thu, 10 Jan 2019 20:46:25 UTC Commit: fb11f90ec8bac6bca9e49bcf1defa89e981b947e https://github.com/geany/geany/commit/fb11f90ec8bac6bca9e49bcf1defa89e981b94...

Log Message: ----------- Merge pull request #2043 from cristicc/feature/diff-lexer-fix

Fix stripping trailing spaces for custom file types using the DIFF lexer.

Fixes #2041.

Modified Paths: -------------- src/editor.c

Modified: src/editor.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -4522,7 +4522,7 @@ void editor_strip_line_trailing_spaces(GeanyEditor *editor, gint line) gchar ch = sci_get_char_at(editor->sci, i);

/* Diff hunks should keep trailing spaces */ - if (sci_get_lexer(editor->sci) == SCLEX_DIFF) + if (editor->document->file_type->id == GEANY_FILETYPES_DIFF) return;

while ((i >= line_start) && ((ch == ' ') || (ch == '\t')))

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