From 9838a8e9a03c473516523982ff18d9b064f413d3 Mon Sep 17 00:00:00 2001 From: Colomban Wendling Date: Sun, 16 Dec 2018 17:45:45 +0100 Subject: [PATCH 1/8] 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. --- NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 025dd43c..d91a626b 100644 --- a/NEWS +++ b/NEWS @@ -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 From c6356444b12b0f2759546334caabb42fd6a28097 Mon Sep 17 00:00:00 2001 From: Colomban Wendling Date: Wed, 2 Jan 2019 22:24:36 +0100 Subject: [PATCH 2/8] Fix escaping of infobar text against entity injection from filename Fixes #2033. --- src/document.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/document.c b/src/document.c index 304d2c3a..37cf323c 100644 --- a/src/document.c +++ b/src/document.c @@ -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(); From f47bae101f426b3dadad3e6c0e3858dde6ae9d52 Mon Sep 17 00:00:00 2001 From: elextr Date: Fri, 28 Dec 2018 16:02:49 +1000 Subject: [PATCH 3/8] Fix broken line breaking on existing lines sci_get_position_from_col() takes line number, not position of start of line. --- src/editor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/editor.c b/src/editor.c index 49a356e7..a33f8657 100644 --- a/src/editor.c +++ b/src/editor.c @@ -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) { From a3d723f0cfbe710d6138a483aab03c2f365b2f0f Mon Sep 17 00:00:00 2001 From: Colomban Wendling Date: Wed, 2 Jan 2019 14:10:07 +0100 Subject: [PATCH 4/8] 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. --- src/editor.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/editor.c b/src/editor.c index a33f8657..95b573ea 100644 --- a/src/editor.c +++ b/src/editor.c @@ -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); From 234df96eaafa9f491319311d63c127975a00d35f Mon Sep 17 00:00:00 2001 From: Frank Lanitz Date: Sun, 16 Dec 2018 15:09:50 +0100 Subject: [PATCH 5/8] Minor update of Ukrainian translation --- po/uk.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/uk.po b/po/uk.po index 163a9a9c..ed1c67d2 100644 --- a/po/uk.po +++ b/po/uk.po @@ -1103,9 +1103,8 @@ msgid "Display" msgstr "Показати" #: ../data/geany.glade.h:216 -#, fuzzy msgid "Column:" -msgstr "Компанія:" +msgstr "Cтовпчик:" #: ../data/geany.glade.h:217 msgid "Color:" From b54f4fac89f702b90a82541a743f6b376f8cfd34 Mon Sep 17 00:00:00 2001 From: Colomban Wendling Date: Fri, 4 Jan 2019 16:13:42 +0100 Subject: [PATCH 6/8] Update NEWS for upcoming 1.34.1 release --- NEWS | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/NEWS b/NEWS index d91a626b..068a6737 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,17 @@ +Geany 1.34.1 (unreleased) + + Bug fixes + * Fix line breaking on existing lines (PR#2027). + * Fix displaying filenames containing XML control characters inside + infobars (Issue#2033). + + Windows + * Fix rectangular selection modifier (PR#2032). + + Internationalization + * Updated translations: uk + + Geany 1.34 (December 16, 2018) General From adda5013c8ed58cc9138d9779810acab36ebd576 Mon Sep 17 00:00:00 2001 From: Colomban Wendling Date: Fri, 4 Jan 2019 16:24:47 +0100 Subject: [PATCH 7/8] Bump version for 1.34.1 --- configure.ac | 2 +- doc/geany.txt | 2 +- geany.exe.manifest | 2 +- geany_private.rc | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 8a586c80..c02d7cf5 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.60]) -AC_INIT([Geany], [1.34], +AC_INIT([Geany], [1.34.1], [https://github.com/geany/geany/issues]) AC_CONFIG_SRCDIR([src/geany.h]) AC_CONFIG_AUX_DIR([build-aux]) diff --git a/doc/geany.txt b/doc/geany.txt index c39b42ae..f0d5aa45 100644 --- a/doc/geany.txt +++ b/doc/geany.txt @@ -1,4 +1,4 @@ -.. |(version)| replace:: 1.34 +.. |(version)| replace:: 1.34.1 .. -*- reStructuredText -*- ======= diff --git a/geany.exe.manifest b/geany.exe.manifest index 14988da1..402f098b 100644 --- a/geany.exe.manifest +++ b/geany.exe.manifest @@ -1,7 +1,7 @@ diff --git a/geany_private.rc b/geany_private.rc index 3d9592b8..63eaa8f9 100644 --- a/geany_private.rc +++ b/geany_private.rc @@ -1,8 +1,8 @@ #include // include for version info constants -#define VER_FILEVERSION 1,34,0,0 -#define VER_FILEVERSION_STR "1.34" +#define VER_FILEVERSION 1,34,1,0 +#define VER_FILEVERSION_STR "1.34.1" #define APP_MANIFEST 1 A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "icons/geany.ico" From 41ca47390932e8d9797db1b63ef7cfa3f0afa87e Mon Sep 17 00:00:00 2001 From: Colomban Wendling Date: Fri, 4 Jan 2019 16:25:20 +0100 Subject: [PATCH 8/8] Set release date --- NEWS | 2 +- doc/geany.1.in | 2 +- doc/geany.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 068a6737..8996e74f 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -Geany 1.34.1 (unreleased) +Geany 1.34.1 (January 4, 2019) Bug fixes * Fix line breaking on existing lines (PR#2027). diff --git a/doc/geany.1.in b/doc/geany.1.in index 4287b3ab..35e1f636 100644 --- a/doc/geany.1.in +++ b/doc/geany.1.in @@ -1,4 +1,4 @@ -.TH "GEANY" "1" "December 16, 2018" "geany @VERSION@" "" +.TH "GEANY" "1" "January 4, 2019" "geany @VERSION@" "" .SH "NAME" Geany \(em a small and lightweight IDE .SH "SYNOPSIS" diff --git a/doc/geany.txt b/doc/geany.txt index f0d5aa45..8e74071f 100644 --- a/doc/geany.txt +++ b/doc/geany.txt @@ -14,7 +14,7 @@ Frank Lanitz, Colomban Wendling, Matthew Brush -:Date: 2018-12-16 +:Date: 2019-01-04 :Version: |(version)| Copyright © 2005-2018