Commits April 2017

commits@lists.geany.org

1 participants
11 discussions

[geany/geany] 9f4407: Add `require_relative` in ruby syntax highlighting (#1472)
by Jacob H. Pratt 29 Apr '17

29 Apr '17

Branch: refs/heads/master Author: Jacob H. Pratt <the.z.cuber(a)gmail.com> Committer: elextr <elextr(a)gmail.com> Date: Sat, 29 Apr 2017 01:20:38 UTC Commit: 9f4407ca29ac4dd6401fbc0688fb8c244158ae3d https://github.com/geany/geany/commit/9f4407ca29ac4dd6401fbc0688fb8c244158a… Log Message: ----------- Add `require_relative` in ruby syntax highlighting (#1472) Modified Paths: -------------- data/filedefs/filetypes.ruby Modified: data/filedefs/filetypes.ruby 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -38,7 +38,7 @@ pod=comment_doc [keywords] # all items must be in one line -primary=__FILE__ load define_method attr_accessor attr_writer attr_reader and def end in or self unless __LINE__ begin defined? ensure module redo super until BEGIN break do false next rescue then when END case else for nil include require retry true while alias class elsif if not return undef yield +primary=__FILE__ load define_method attr_accessor attr_writer attr_reader and def end in or self unless __LINE__ begin defined? ensure module redo super until BEGIN break do false next rescue then when END case else for nil include require require_relative retry true while alias class elsif if not return undef yield [settings] -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] 215510: Fix SSL usage
by Jiří Techet 28 Apr '17

28 Apr '17

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Thu, 27 Apr 2017 19:33:54 UTC Commit: 215510da606491ad6c4cd5a3a4731a18633a1c82 https://github.com/geany/geany-osx/commit/215510da606491ad6c4cd5a3a4731a186… Log Message: ----------- Fix SSL usage Using HTTPS requires glib-networking library whose modules are under gio/modules subdirectory of glib. Also GIO_MODULE_DIR has to be defined so the module is found. Modified Paths: -------------- geany.bundle launcher-gtk3.sh launcher.sh Modified: geany.bundle 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -102,9 +102,9 @@ ${prefix}/lib/enchant/*.so </binary> -  +  <binary> - ${prefix}/lib/engines/*.dylib + ${prefix}/lib/gio/modules/*.so </binary>  Modified: launcher-gtk3.sh 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -197,5 +197,6 @@ fi export GEANY_PLUGINS_SHARE_PATH="$bundle_res/share/geany-plugins" export ENCHANT_MODULE_PATH="$bundle_lib/enchant" +export GIO_MODULE_DIR="$bundle_lib/gio/modules" $EXEC "$bundle_contents/MacOS/$name-bin" "$@" $EXTRA_ARGS Modified: launcher.sh 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -197,5 +197,6 @@ fi export GEANY_PLUGINS_SHARE_PATH="$bundle_res/share/geany-plugins" export ENCHANT_MODULE_PATH="$bundle_lib/enchant" +export GIO_MODULE_DIR="$bundle_lib/gio/modules" $EXEC "$bundle_contents/MacOS/$name-bin" "$@" $EXTRA_ARGS -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] e257ab: Add SSL encryption engines
by Jiří Techet 27 Apr '17

27 Apr '17

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Wed, 26 Apr 2017 20:43:03 UTC Commit: e257ab19f9907650c2e5fc28b16e0d8b1de2fb58 https://github.com/geany/geany-osx/commit/e257ab19f9907650c2e5fc28b16e0d8b1… Log Message: ----------- Add SSL encryption engines Modified Paths: -------------- geany.bundle Modified: geany.bundle 5 lines changed, 5 insertions(+), 0 deletions(-) =================================================================== @@ -102,6 +102,11 @@ ${prefix}/lib/enchant/*.so </binary> +  + <binary> + ${prefix}/lib/engines/*.dylib + </binary> +  <binary> ${prefix}/lib/geany/*.so -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] 6562e6: Fix libenchant usage inside bundle
by Jiří Techet 27 Apr '17

27 Apr '17

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Wed, 26 Apr 2017 19:10:29 UTC Commit: 6562e6eae20afe556af1674da2c5c048ff80b936 https://github.com/geany/geany-osx/commit/6562e6eae20afe556af1674da2c5c048f… Log Message: ----------- Fix libenchant usage inside bundle First, we need to add all the enchant modules to the bundle. Second, we need to define ENCHANT_MODULE_PATH environment vairable (OS X version of enchant is already patched for this) so the modules are correctly found. Modified Paths: -------------- geany.bundle launcher-gtk3.sh launcher.sh Modified: geany.bundle 5 lines changed, 5 insertions(+), 0 deletions(-) =================================================================== @@ -97,6 +97,11 @@ ${prefix}/libexec/gnome-pty-helper </binary> +  + <binary> + ${prefix}/lib/enchant/*.so + </binary> +  <binary> ${prefix}/lib/geany/*.so Modified: launcher-gtk3.sh 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -196,5 +196,6 @@ if /bin/expr "x$1" : '^x-psn_' > /dev/null; then fi export GEANY_PLUGINS_SHARE_PATH="$bundle_res/share/geany-plugins" +export ENCHANT_MODULE_PATH="$bundle_lib/enchant" $EXEC "$bundle_contents/MacOS/$name-bin" "$@" $EXTRA_ARGS Modified: launcher.sh 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -196,5 +196,6 @@ if /bin/expr "x$1" : '^x-psn_' > /dev/null; then fi export GEANY_PLUGINS_SHARE_PATH="$bundle_res/share/geany-plugins" +export ENCHANT_MODULE_PATH="$bundle_lib/enchant" $EXEC "$bundle_contents/MacOS/$name-bin" "$@" $EXTRA_ARGS -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] 83351a: Add environment variable to define geany-plugins path inside share
by Jiří Techet 27 Apr '17

27 Apr '17

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Wed, 26 Apr 2017 19:09:30 UTC Commit: 83351a9c7428f0f672e88d8b3f9f78e04f2457c9 https://github.com/geany/geany-osx/commit/83351a9c7428f0f672e88d8b3f9f78e04… Log Message: ----------- Add environment variable to define geany-plugins path inside share Modified Paths: -------------- launcher-gtk3.sh launcher.sh Modified: launcher-gtk3.sh 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -195,4 +195,6 @@ if /bin/expr "x$1" : '^x-psn_' > /dev/null; then shift 1 fi +export GEANY_PLUGINS_SHARE_PATH="$bundle_res/share/geany-plugins" + $EXEC "$bundle_contents/MacOS/$name-bin" "$@" $EXTRA_ARGS Modified: launcher.sh 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -195,4 +195,6 @@ if /bin/expr "x$1" : '^x-psn_' > /dev/null; then shift 1 fi +export GEANY_PLUGINS_SHARE_PATH="$bundle_res/share/geany-plugins" + $EXEC "$bundle_contents/MacOS/$name-bin" "$@" $EXTRA_ARGS -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] 192522: Add libsoup dependency to support GeniusPaste plugin
by Jiří Techet 27 Apr '17

27 Apr '17

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Wed, 26 Apr 2017 18:38:08 UTC Commit: 1925222e8f6e94c133cfc726bf95b030be8d34c2 https://github.com/geany/geany-osx/commit/1925222e8f6e94c133cfc726bf95b030b… Log Message: ----------- Add libsoup dependency to support GeniusPaste plugin Modified Paths: -------------- geany.modules Modified: geany.modules 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -169,6 +169,7 @@ <dep package="vala" /> <dep package="libgit2" /> <dep package="enchant" /> + <dep package="libsoup" />  </dependencies> </metamodule> -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] dbcf45: Update HACKING (#1479)
by Vasiliy Faronov 25 Apr '17

25 Apr '17

Branch: refs/heads/master Author: Vasiliy Faronov <vfaronov(a)gmail.com> Committer: elextr <elextr(a)gmail.com> Date: Tue, 25 Apr 2017 08:09:40 UTC Commit: dbcf456031127ce7e371606dcc75507024eb95df https://github.com/geany/geany/commit/dbcf456031127ce7e371606dcc75507024eb9… Log Message: ----------- Update HACKING (#1479) * Update obsolete references to GLib 2.27/28 in HACKING Fixes #1476. * Replace obsolete gcc -W option with -Wextra in HACKING According to gcc --help=warnings, -W is a deprecated option and -Wextra should be used instead. Modified Paths: -------------- HACKING Modified: HACKING 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -176,7 +176,7 @@ libs (including GLib, GDK and Pango) has the advantages that you don't get confused by any newer API additions and you don't have to take care about whether you can use them or not. -You might want to pass the ``-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_28`` C +You might want to pass the ``-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32`` C preprocessor flag to get warnings about newer symbols from the GLib. On the contrary, you might also want to get deprecation warnings for symbols @@ -196,7 +196,7 @@ Coding them down into smaller static functions where possible. This makes code much easier to read and maintain. * Use GLib types and functions - gint not int, g_free() not free(). -* Your code should build against GLib 2.27.3 and GTK 2.24. At least for the +* Your code should build against GLib 2.32 and GTK 2.24. At least for the moment, we want to keep the minimum requirement for GTK at 2.24 (of course, you can use the GTK_CHECK_VERSION macro to protect code using later versions). @@ -212,7 +212,7 @@ Compiler options & warnings Use ``CFLAGS='-Wfoo' ./configure`` or ``CFLAGS='-Wfoo' ./autogen.sh`` to set warning options (as well as anything else e.g. -g -O2). -* Enable warnings - for gcc use '-Wall -W' (and optionally +* Enable warnings - for gcc use '-Wall -Wextra' (and optionally -Wno-unused-parameter to avoid unused parameter warnings in Glade callbacks). * You should try to write ISO C99 code for portability, so always -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] c296ef: fix typo in russian translation (#1474)
by yurayko 23 Apr '17

23 Apr '17

Branch: refs/heads/master Author: yurayko <yuray(a)komyakino.ru> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Sun, 23 Apr 2017 17:07:29 UTC Commit: c296efed642611f3dba238c5c576b712786b424e https://github.com/geany/geany/commit/c296efed642611f3dba238c5c576b712786b4… Log Message: ----------- fix typo in russian translation (#1474) Modified Paths: -------------- po/ru.po Modified: po/ru.po 10 lines changed, 5 insertions(+), 5 deletions(-) =================================================================== @@ -1176,7 +1176,7 @@ msgid "" "(usually not needed)" msgstr "" "Эта опция отключает автоматическое определение кодировки файла при открытии; " -"файлы c кодировкой, отличной от Unicode, будут открыватся в указанной " +"файлы c кодировкой, отличной от Unicode, будут открываться в указанной " "кодировке. Обычно в этом нет необходимости." #: ../data/geany.glade.h:242 @@ -1517,7 +1517,7 @@ msgstr "Оболочка:" #: ../data/geany.glade.h:316 msgid "Sets the foreground color of the text in the terminal widget" -msgstr "Устанавлиивает цвет текста для окна терминала" +msgstr "Устанавливает цвет текста для окна терминала" #: ../data/geany.glade.h:317 msgid "Sets the background color of the text in the terminal widget" @@ -3364,7 +3364,7 @@ msgstr "Прокрутить вниз на одну строку" #: ../src/keybindings.c:402 msgid "Complete snippet" -msgstr "Завешить фрагмент кода" +msgstr "Завершить фрагмент кода" #: ../src/keybindings.c:404 msgid "Move cursor in snippet" @@ -6293,7 +6293,7 @@ msgstr "По горизонтали" #~ msgstr "Собрать:" #~ msgid "Choose Project Run Command" -#~ msgstr "Выберите команду запсука проекта" +#~ msgstr "Выберите команду запуска проекта" #~ msgid "" #~ "Command-line to run in the project base directory. Options can be " @@ -6386,7 +6386,7 @@ msgstr "По горизонтали" #~ msgstr "Установить программы и опции для сборки и просмотра (La)TeX файлов." #~ msgid "Set the commands for building and running programs." -#~ msgstr "Установить команды для сборки и запуска програм." +#~ msgstr "Установить команды для сборки и запуска программ." #~ msgid "Terminal plugin" #~ msgstr "Модуль терминала" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 6f6921: C: Fix line continuation handling (#1370)
by Colomban Wendling 20 Apr '17

20 Apr '17

Branch: refs/heads/master Author: Colomban Wendling <lists.ban(a)herbesfolles.org> Committer: elextr <elextr(a)gmail.com> Date: Thu, 20 Apr 2017 06:57:02 UTC Commit: 6f692112e39fa0714d882332b8f935419fd69a27 https://github.com/geany/geany/commit/6f692112e39fa0714d882332b8f935419fd69… Log Message: ----------- C: Fix line continuation handling (#1370) Escaped newlines were properly handled inside preprocessor directives, but not otherwise. Seeing `continue` here suggests the code used to work a long time ago but some loop refactoring broke it, as now it would not stay in the loop unless in a preprocessor directive. Or maybe it only ever worked for preprocessor directives, and the `continue` was superfluous? Fixes #1370. Modified Paths: -------------- ctags/main/lcpp.c tests/ctags/Makefile.am tests/ctags/backslashes.c tests/ctags/backslashes.c.tags Modified: ctags/main/lcpp.c 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -704,7 +704,10 @@ extern int cppGetc (void) int next = getcFromInputFile (); if (next == NEWLINE) - continue; + { + c = getcFromInputFile (); + goto process; + } else ungetcToInputFile (next); break; Modified: tests/ctags/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -20,6 +20,7 @@ test_sources = \ array-spec.f90 \ attributes.cs \ auto.f \ + backslashes.c \ bit_field.c \ block.f90 \ bracematch.js \ Modified: tests/ctags/backslashes.c 29 lines changed, 29 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,29 @@ +typedef int T; + +int func1(\ +int var1, int var2, ...); + +int func2(int var1, \ +int var2, ...); + +int func3(T \ + var1, T var2, ...); +int func4(T var1, \ + T var2, ...); + +int func5(int \ + var1, int var2, ...); + +// check continuations in macros are properly handled +#define MACRO1 \ + ( +int func6(void); +#define MACRO2(x) \ + int x(void); +#define MACRO3(y) \ + int \ + y \ + ( \ + void \ + ); +int func7(int a); Modified: tests/ctags/backslashes.c.tags 12 lines changed, 12 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,12 @@ +# format=tagmanager +MACRO1�65536�0 +MACRO2�131072�(x)�0 +MACRO3�131072�(y)�0 +T�4096�0�int +func1�1024�(int var1, int var2, ...)�0�int +func2�1024�(int var1, int var2, ...)�0�int +func3�1024�(T var1, T var2, ...)�0�int +func4�1024�(T var1, T var2, ...)�0�int +func5�1024�(int var1, int var2, ...)�0�int +func6�1024�(void)�0�int +func7�1024�(int a)�0�int -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 270700: Fix crash when plugin_set_key_group() is called several times by plugins (#1426)
by Jiří Techet 15 Apr '17

15 Apr '17

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: elextr <elextr(a)gmail.com> Date: Sat, 15 Apr 2017 10:48:03 UTC Commit: 2707006286fa52400776c24ad6c393d2459324fa https://github.com/geany/geany/commit/2707006286fa52400776c24ad6c393d245932… Log Message: ----------- Fix crash when plugin_set_key_group() is called several times by plugins (#1426) When plugin calls plugin_set_key_group() several times for the same group (when creating keybindings dynamically and needs to reset them), it crashes with the current code the second time it gets called. The reason is that group->plugin_keys is an array into which entries of group->key_items point and when calling g_ptr_array_set_size(group->key_items, 0); it calls free_key_binding() for every item - when these items are deallocated by g_free(group->plugin_keys) previously, calls of free_key_binding() reference an invalid memory. Just first resizing group->key_items (and calling free_key_binding() for its items) and freeing group->plugin_keys afterwards fixes the problem. Modified Paths: -------------- src/keybindings.c Modified: src/keybindings.c 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -2697,10 +2697,12 @@ GeanyKeyGroup *keybindings_set_group(GeanyKeyGroup *group, const gchar *section_ group = g_new0(GeanyKeyGroup, 1); add_kb_group(group, section_name, label, callback, TRUE); } + /* Calls free_key_binding() for individual entries for plugins - has to be + * called before g_free(group->plugin_keys) */ + g_ptr_array_set_size(group->key_items, 0); g_free(group->plugin_keys); group->plugin_keys = g_new0(GeanyKeyBinding, count); group->plugin_key_count = count; - g_ptr_array_set_size(group->key_items, 0); return group; } -------------- 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 April 2017