Branch: refs/heads/Fix_line_break
Author: elextr <elextr(a)gmail.com>
Committer: GitHub <noreply(a)github.com>
Date: Wed, 19 Sep 2018 21:55:08 UTC
Commit: f4cd60ceacbd3ab31498dad6d1e9cffdedb7b10a
https://github.com/geany/geany/commit/f4cd60ceacbd3ab31498dad6d1e9cffdedb7b…
Log Message:
-----------
Fix line breaking with multibyte characters
Fixes #1958
Also replace GDK_space with ASCII space, its searching for that, not the keycode (which just happens to have the same value, lucky).
Modified Paths:
--------------
src/editor.c
Modified: src/editor.c
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -556,12 +556,12 @@ static void check_line_breaking(GeanyEditor *editor, gint pos)
return;
/* look for the last space before line_break_column */
- pos = MIN(pos, lstart + get_project_pref(line_break_column));
+ pos = sci_get_position_from_col(sci, lstart, get_project_pref(line_break_column));
while (pos > lstart)
{
c = sci_get_char_at(sci, --pos);
- if (c == GDK_space)
+ if (c == ' ')
{
gint diff, last_pos, last_col;
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Colomban Wendling <ban(a)herbesfolles.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Wed, 01 Aug 2018 12:41:00 UTC
Commit: 958deb55fe80e2ef27d8f7a4f1a500531933116c
https://github.com/geany/geany/commit/958deb55fe80e2ef27d8f7a4f1a5005319331…
Log Message:
-----------
Add a few extra hints in the Scintilla update script
Modified Paths:
--------------
scripts/update-scintilla.sh
Modified: scripts/update-scintilla.sh
5 lines changed, 4 insertions(+), 1 deletions(-)
===================================================================
@@ -70,7 +70,10 @@ if git status -unormal -s scintilla | grep '^??'; then
Untracked files above have been introduced by the new Scintilla version and
should be added to version control if appropriate, or removed.
-Don't forget to add new files to the build system.
+You can add them to Git with the command:
+$ git add $(git status -unormal -s scintilla | grep '^??' | cut -b4- | sed '$!{s/$/ \\/};1!{s/^/ /}')
+
+Don't forget to add new files to the build system (scintilla/Makefile.am).
EOF
fi
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).