Commits January 2019

commits@lists.geany.org

1 participants
32 discussions

[geany/geany] a3d723: Fix modifier for creating rectangular selections on Windows
by Colomban Wendling 04 Jan '19

04 Jan '19

Branch: refs/heads/1.34 Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Fri, 04 Jan 2019 11:54:35 UTC Commit: a3d723f0cfbe710d6138a483aab03c2f365b2f0f https://github.com/geany/geany/commit/a3d723f0cfbe710d6138a483aab03c2f365b2… Log Message: ----------- Fix modifier for creating rectangular selections on Windows 33dafac8f0713de79f04e2ebce2399fb914d6792 restored the pre-Scintilla 3.10 default on non-Windows, but also changed the Windows one. Fix this so the modifier keeps its historical value on Windows as well. Modified Paths: -------------- src/editor.c Modified: src/editor.c 11 lines changed, 9 insertions(+), 2 deletions(-) =================================================================== @@ -4905,6 +4905,7 @@ static gboolean register_named_icon(ScintillaObject *sci, guint id, const gchar static ScintillaObject *create_new_sci(GeanyEditor *editor) { ScintillaObject *sci; + int rectangular_selection_modifier; sci = SCINTILLA(scintilla_new()); @@ -4936,8 +4937,14 @@ static ScintillaObject *create_new_sci(GeanyEditor *editor) /* necessary for column mode editing, implemented in Scintilla since 2.0 */ SSM(sci, SCI_SETADDITIONALSELECTIONTYPING, 1, 0); - /* rectangular selection modifier for creating rectangular selections with the mouse */ - SSM(sci, SCI_SETRECTANGULARSELECTIONMODIFIER, SCMOD_CTRL, 0); + /* rectangular selection modifier for creating rectangular selections with the mouse. + * We use the historical Scintilla values by default. */ +#ifdef G_OS_WIN32 + rectangular_selection_modifier = SCMOD_ALT; +#else + rectangular_selection_modifier = SCMOD_CTRL; +#endif + SSM(sci, SCI_SETRECTANGULARSELECTIONMODIFIER, rectangular_selection_modifier, 0); /* virtual space */ SSM(sci, SCI_SETVIRTUALSPACEOPTIONS, editor_prefs.show_virtual_space, 0); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] a3d723: Fix modifier for creating rectangular selections on Windows
by Colomban Wendling 04 Jan '19

04 Jan '19

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Fri, 04 Jan 2019 11:54:35 UTC Commit: a3d723f0cfbe710d6138a483aab03c2f365b2f0f https://github.com/geany/geany/commit/a3d723f0cfbe710d6138a483aab03c2f365b2… Log Message: ----------- Fix modifier for creating rectangular selections on Windows 33dafac8f0713de79f04e2ebce2399fb914d6792 restored the pre-Scintilla 3.10 default on non-Windows, but also changed the Windows one. Fix this so the modifier keeps its historical value on Windows as well. Modified Paths: -------------- src/editor.c Modified: src/editor.c 11 lines changed, 9 insertions(+), 2 deletions(-) =================================================================== @@ -4905,6 +4905,7 @@ static gboolean register_named_icon(ScintillaObject *sci, guint id, const gchar static ScintillaObject *create_new_sci(GeanyEditor *editor) { ScintillaObject *sci; + int rectangular_selection_modifier; sci = SCINTILLA(scintilla_new()); @@ -4936,8 +4937,14 @@ static ScintillaObject *create_new_sci(GeanyEditor *editor) /* necessary for column mode editing, implemented in Scintilla since 2.0 */ SSM(sci, SCI_SETADDITIONALSELECTIONTYPING, 1, 0); - /* rectangular selection modifier for creating rectangular selections with the mouse */ - SSM(sci, SCI_SETRECTANGULARSELECTIONMODIFIER, SCMOD_CTRL, 0); + /* rectangular selection modifier for creating rectangular selections with the mouse. + * We use the historical Scintilla values by default. */ +#ifdef G_OS_WIN32 + rectangular_selection_modifier = SCMOD_ALT; +#else + rectangular_selection_modifier = SCMOD_CTRL; +#endif + SSM(sci, SCI_SETRECTANGULARSELECTIONMODIFIER, rectangular_selection_modifier, 0); /* virtual space */ SSM(sci, SCI_SETVIRTUALSPACEOPTIONS, editor_prefs.show_virtual_space, 0); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 83d36f: Merge pull request #2032 from b4n/scintilla-rectangular-modifier-windows
by Colomban Wendling 04 Jan '19

04 Jan '19

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Fri, 04 Jan 2019 11:53:26 UTC Commit: 83d36f00ba9ff22a0bd0503dd847b395bc7b154c https://github.com/geany/geany/commit/83d36f00ba9ff22a0bd0503dd847b395bc7b1… Log Message: ----------- Merge pull request #2032 from b4n/scintilla-rectangular-modifier-windows Fix modifier for creating rectangular selections on Windows Modified Paths: -------------- src/editor.c Modified: src/editor.c 11 lines changed, 9 insertions(+), 2 deletions(-) =================================================================== @@ -4900,6 +4900,7 @@ static gboolean register_named_icon(ScintillaObject *sci, guint id, const gchar static ScintillaObject *create_new_sci(GeanyEditor *editor) { ScintillaObject *sci; + int rectangular_selection_modifier; sci = SCINTILLA(scintilla_new()); @@ -4931,8 +4932,14 @@ static ScintillaObject *create_new_sci(GeanyEditor *editor) /* necessary for column mode editing, implemented in Scintilla since 2.0 */ SSM(sci, SCI_SETADDITIONALSELECTIONTYPING, 1, 0); - /* rectangular selection modifier for creating rectangular selections with the mouse */ - SSM(sci, SCI_SETRECTANGULARSELECTIONMODIFIER, SCMOD_CTRL, 0); + /* rectangular selection modifier for creating rectangular selections with the mouse. + * We use the historical Scintilla values by default. */ +#ifdef G_OS_WIN32 + rectangular_selection_modifier = SCMOD_ALT; +#else + rectangular_selection_modifier = SCMOD_CTRL; +#endif + SSM(sci, SCI_SETRECTANGULARSELECTIONMODIFIER, rectangular_selection_modifier, 0); /* virtual space */ SSM(sci, SCI_SETVIRTUALSPACEOPTIONS, editor_prefs.show_virtual_space, 0); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] f47bae: Fix broken line breaking on existing lines
by elextr 02 Jan '19

02 Jan '19

Branch: refs/heads/1.34 Author: elextr <elextr(a)gmail.com> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 02 Jan 2019 22:17:59 UTC Commit: f47bae101f426b3dadad3e6c0e3858dde6ae9d52 https://github.com/geany/geany/commit/f47bae101f426b3dadad3e6c0e3858dde6ae9… Log Message: ----------- Fix broken line breaking on existing lines sci_get_position_from_col() takes line number, not position of start of line. Modified Paths: -------------- src/editor.c Modified: src/editor.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -556,7 +556,7 @@ static void check_line_breaking(GeanyEditor *editor, gint pos) return; /* look for the last space before line_break_column */ - pos = sci_get_position_from_col(sci, lstart, get_project_pref(line_break_column)); + pos = sci_get_position_from_col(sci, line, get_project_pref(line_break_column)); while (pos > lstart) { -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] f47bae: Fix broken line breaking on existing lines
by elextr 02 Jan '19

02 Jan '19

Branch: refs/heads/master Author: elextr <elextr(a)gmail.com> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 02 Jan 2019 22:17:59 UTC Commit: f47bae101f426b3dadad3e6c0e3858dde6ae9d52 https://github.com/geany/geany/commit/f47bae101f426b3dadad3e6c0e3858dde6ae9… Log Message: ----------- Fix broken line breaking on existing lines sci_get_position_from_col() takes line number, not position of start of line. Modified Paths: -------------- src/editor.c Modified: src/editor.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -556,7 +556,7 @@ static void check_line_breaking(GeanyEditor *editor, gint pos) return; /* look for the last space before line_break_column */ - pos = sci_get_position_from_col(sci, lstart, get_project_pref(line_break_column)); + pos = sci_get_position_from_col(sci, line, get_project_pref(line_break_column)); while (pos > lstart) { -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] c63564: Fix escaping of infobar text against entity injection from filename
by Colomban Wendling 02 Jan '19

02 Jan '19

Branch: refs/heads/1.34 Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 02 Jan 2019 22:17:51 UTC Commit: c6356444b12b0f2759546334caabb42fd6a28097 https://github.com/geany/geany/commit/c6356444b12b0f2759546334caabb42fd6a28… Log Message: ----------- Fix escaping of infobar text against entity injection from filename Fixes #2033. Modified Paths: -------------- src/document.c Modified: src/document.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -3459,7 +3459,7 @@ static GtkWidget* document_show_message(GeanyDocument *doc, GtkMessageType msgty text = g_strdup_vprintf(format, args); va_end(args); - markup = g_strdup_printf("%s", text); + markup = g_markup_printf_escaped("%s", text); g_free(text); info_widget = gtk_info_bar_new(); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] c63564: Fix escaping of infobar text against entity injection from filename
by Colomban Wendling 02 Jan '19

02 Jan '19

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 02 Jan 2019 22:17:51 UTC Commit: c6356444b12b0f2759546334caabb42fd6a28097 https://github.com/geany/geany/commit/c6356444b12b0f2759546334caabb42fd6a28… Log Message: ----------- Fix escaping of infobar text against entity injection from filename Fixes #2033. Modified Paths: -------------- src/document.c Modified: src/document.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -3459,7 +3459,7 @@ static GtkWidget* document_show_message(GeanyDocument *doc, GtkMessageType msgty text = g_strdup_vprintf(format, args); va_end(args); - markup = g_strdup_printf("%s", text); + markup = g_markup_printf_escaped("%s", text); g_free(text); info_widget = gtk_info_bar_new(); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 9838a8: Remove non-existing language from 1.34 translation NEWS
by Colomban Wendling 02 Jan '19

02 Jan '19

Branch: refs/heads/1.34 Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 02 Jan 2019 22:17:35 UTC Commit: 9838a8e9a03c473516523982ff18d9b064f413d3 https://github.com/geany/geany/commit/9838a8e9a03c473516523982ff18d9b064f41… Log Message: ----------- Remove non-existing language from 1.34 translation NEWS It most likely was a typo for `da`, and all actually updated translations are properly listed. Modified Paths: -------------- NEWS Modified: NEWS 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -47,7 +47,7 @@ Geany 1.34 (December 16, 2018) Internationalization * Add translation: da - * Updated translations: de, dk, es, fr, hu, it, ja, pt, sv, sk, uk, ru, + * Updated translations: de, es, fr, hu, it, ja, pt, sv, sk, uk, ru, zh_CN, zh_TW -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 9838a8: Remove non-existing language from 1.34 translation NEWS
by Colomban Wendling 02 Jan '19

02 Jan '19

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 02 Jan 2019 22:17:35 UTC Commit: 9838a8e9a03c473516523982ff18d9b064f413d3 https://github.com/geany/geany/commit/9838a8e9a03c473516523982ff18d9b064f41… Log Message: ----------- Remove non-existing language from 1.34 translation NEWS It most likely was a typo for `da`, and all actually updated translations are properly listed. Modified Paths: -------------- NEWS Modified: NEWS 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -47,7 +47,7 @@ Geany 1.34 (December 16, 2018) Internationalization * Add translation: da - * Updated translations: de, dk, es, fr, hu, it, ja, pt, sv, sk, uk, ru, + * Updated translations: de, es, fr, hu, it, ja, pt, sv, sk, uk, ru, zh_CN, zh_TW -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 969e00: Merge pull request #2027 from geany/elextr-patch-4
by Colomban Wendling 02 Jan '19

02 Jan '19

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 02 Jan 2019 21:42:16 UTC Commit: 969e00a03f4e7d80f138498de78bb762cf844e60 https://github.com/geany/geany/commit/969e00a03f4e7d80f138498de78bb762cf844… Log Message: ----------- Merge pull request #2027 from geany/elextr-patch-4 Fix broken line breaking on existing lines Modified Paths: -------------- src/editor.c Modified: src/editor.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -556,7 +556,7 @@ static void check_line_breaking(GeanyEditor *editor, gint pos) return; /* look for the last space before line_break_column */ - pos = sci_get_position_from_col(sci, lstart, get_project_pref(line_break_column)); + pos = sci_get_position_from_col(sci, line, get_project_pref(line_break_column)); while (pos > lstart) { -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits January 2019