Commits January 2017

commits@lists.geany.org

1 participants
11 discussions

[geany/geany] 38d598: Update Catalan translation (#1375)
by Robert Antoni Buj Gelonch 24 Jan '17

24 Jan '17

Branch: refs/heads/master Author: Robert Antoni Buj Gelonch <rbuj(a)users.noreply.github.com> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Tue, 24 Jan 2017 08:38:15 UTC Commit: 38d59835dbcf44bba73ea86b8511b60ef8c1626e https://github.com/geany/geany/commit/38d59835dbcf44bba73ea86b8511b60ef8c16… Log Message: ----------- Update Catalan translation (#1375) Modified Paths: -------------- po/ca.po Modified: po/ca.po 25 lines changed, 14 insertions(+), 11 deletions(-) =================================================================== @@ -9,15 +9,15 @@ msgstr "" "Project-Id-Version: Geany 1.28\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-10-30 12:54+0100\n" -"PO-Revision-Date: 2016-10-22 21:20+0200\n" +"PO-Revision-Date: 2017-01-24 09:11+0100\n" "Last-Translator: Robert Antoni Buj Gelonch <rbuj(a)fedoraproject.org>\n" "Language-Team: Catalan <ca(a)dodds.net>\n" "Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" -"X-Generator: Poedit 1.8.10\n" +"X-Generator: Poedit 1.8.11\n" #: ../geany.desktop.in.h:1 ../data/geany.glade.h:343 msgid "Geany" @@ -1044,7 +1044,7 @@ msgstr "" #: ../data/geany.glade.h:212 msgid "Lines visible _around the cursor:" -msgstr "" +msgstr "Línies visibles al volt_ant del cursor:" #: ../data/geany.glade.h:213 msgid "<b>Display</b>" @@ -2720,8 +2720,8 @@ msgid "" "An error occurred or file information could not be retrieved (e.g. from a " "new file)." msgstr "" -"S'ha produït un error o no s'ha pogut recuperar a la informació del fitxer " -"(p. ex. des d'un fitxer nou)." +"S'ha produït un error o no s'ha pogut recuperar la informació del fitxer (p. " +"ex. des d'un fitxer nou)." #: ../src/dialogs.c:1204 ../src/dialogs.c:1205 ../src/dialogs.c:1206 #: ../src/dialogs.c:1212 ../src/dialogs.c:1213 ../src/dialogs.c:1214 @@ -3356,12 +3356,11 @@ msgstr "Refés" #: ../src/keybindings.c:388 msgid "Delete to line end" -msgstr "Suprimeix fins al final de la línia" +msgstr "Suprimeix fins a l'acabament de la línia" #: ../src/keybindings.c:391 -#, fuzzy msgid "Delete to beginning of line" -msgstr "Suprimeix fins al final de la línia" +msgstr "Suprimeix fins al començament de la línia" #: ../src/keybindings.c:394 msgid "_Transpose Current Line" @@ -4056,6 +4055,8 @@ msgid "" "Proxy plugin '%s' extension '%s' starts with a dot. Please fix your proxy " "plugin." msgstr "" +"El connector del servidor intermediari «%s» amb extensió «%s» comença amb un " +"punt. Corregiu el connector del vostre servidor intermediari." #: ../src/pluginutils.c:411 msgid "Configure Plugins" @@ -4340,13 +4341,12 @@ msgid "_Use regular expressions" msgstr "_Utilitza expressions regulars" #: ../src/search.c:311 -#, fuzzy msgid "" "Use Perl-like regular expressions. For detailed information about using " "regular expressions, please refer to the manual." msgstr "" -"Utilitza expressions regulars de tipus POSIX. Per a informació detallada " -"sobre expressions regulars, llegiu la documentació." +"Utilitza expressions regulars de tipus Perl. Per a informació detallada " +"sobre expressions regulars, consulteu el manual." #: ../src/search.c:316 msgid "Use _escape sequences" @@ -5018,6 +5018,9 @@ msgid "" "Cannot execute template command \"%s\". Hint: incorrect paths in the command " "are a common cause of errors. Error: %s." msgstr "" +"No es pot executar l'ordre de la plantilla «%s». Consell: els camins " +"incorrectes a l'ordre acostumen a ser una causa comuna dels errors. Error: " +"%s." #. custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" #: ../src/toolbar.c:58 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 00a3ae: Merge pull request #1361 from Akronix/keywords-js.filetypes
by Colomban Wendling 23 Jan '17

23 Jan '17

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 23 Jan 2017 13:10:45 UTC Commit: 00a3aef94de14f157b27a0fabb9cd19f6d66708a https://github.com/geany/geany/commit/00a3aef94de14f157b27a0fabb9cd19f6d667… Log Message: ----------- Merge pull request #1361 from Akronix/keywords-js.filetypes Updated filetypes.javascript keywords Modified Paths: -------------- data/filedefs/filetypes.javascript Modified: data/filedefs/filetypes.javascript 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -3,7 +3,7 @@ [keywords] # all items must be in one line -primary=break case catch class const continue default delete do each else extends false finally for function get if in Infinity instanceof let NaN new null return set static super switch this throw true try typeof undefined var void while with yield prototype +primary=break case catch class const continue debugger default delete do else enum export extends false finally for function get if import in Infinity instanceof let NaN new null return set static super switch this throw true try typeof undefined var void while with yield prototype async await secondary=Array Boolean Date Function Math Number Object String RegExp EvalError Error RangeError ReferenceError SyntaxError TypeError URIError constructor prototype decodeURI decodeURIComponent encodeURI encodeURIComponent eval isFinite isNaN parseFloat parseInt [lexer_properties=C] -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] b974d2: C: Fix line continuation handling
by Colomban Wendling 20 Jan '17

20 Jan '17

Branch: refs/heads/c/backslashes Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Fri, 20 Jan 2017 13:05:03 UTC Commit: b974d26dff67d0e8dd768057b8b47a0ba67f0315 https://github.com/geany/geany/commit/b974d26dff67d0e8dd768057b8b47a0ba67f0… Log Message: ----------- C: Fix line continuation handling 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] c69846: Removed 'alert' from secondary keywords since it depends on a DOM environment
by Abel 'Akronix' Serrano Juste 14 Jan '17

14 Jan '17

Branch: refs/heads/master Author: Abel 'Akronix' Serrano Juste <akronix5(a)gmail.com> Committer: Abel 'Akronix' Serrano Juste <akronix5(a)gmail.com> Date: Sat, 14 Jan 2017 20:26:36 UTC Commit: c6984699d3fc9f7055eb25a5362afe990b9c82a6 https://github.com/geany/geany/commit/c6984699d3fc9f7055eb25a5362afe990b9c8… Log Message: ----------- Removed 'alert' from secondary keywords since it depends on a DOM environment Modified Paths: -------------- data/filedefs/filetypes.javascript Modified: data/filedefs/filetypes.javascript 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -4,7 +4,7 @@ [keywords] # all items must be in one line primary=break case catch class const continue debugger default delete do else enum export extends false finally for function get if import in Infinity instanceof let NaN new null return set static super switch this throw true try typeof undefined var void while with yield prototype async await -secondary=Array Boolean Date Function Math Number Object String RegExp EvalError Error RangeError ReferenceError SyntaxError TypeError URIError constructor prototype decodeURI decodeURIComponent encodeURI encodeURIComponent eval isFinite isNaN parseFloat parseInt alert +secondary=Array Boolean Date Function Math Number Object String RegExp EvalError Error RangeError ReferenceError SyntaxError TypeError URIError constructor prototype decodeURI decodeURIComponent encodeURI encodeURIComponent eval isFinite isNaN parseFloat parseInt [settings] # default extension used when saving files -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 59935a: Merge pull request #1356 from b4n/snippets-keybindings-signature
by Colomban Wendling 12 Jan '17

12 Jan '17

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 12 Jan 2017 18:39:42 UTC Commit: 59935a3579df0d418cb483aa7f63515210690ce1 https://github.com/geany/geany/commit/59935a3579df0d418cb483aa7f63515210690… Log Message: ----------- Merge pull request #1356 from b4n/snippets-keybindings-signature Fix snippets keybindings not blocking handled events Modified Paths: -------------- src/editor.c Modified: src/editor.c 8 lines changed, 5 insertions(+), 3 deletions(-) =================================================================== @@ -191,13 +191,13 @@ static void snippets_load(GKeyFile *sysconfig, GKeyFile *userconfig) } -static void on_snippet_keybinding_activate(gchar *key) +static gboolean on_snippet_keybinding_activate(gchar *key) { GeanyDocument *doc = document_get_current(); const gchar *s; if (!doc || !gtk_widget_has_focus(GTK_WIDGET(doc->editor->sci))) - return; + return FALSE; s = snippets_find_completion_by_name(doc->file_type->name, key); if (!s) /* allow user to specify keybindings for "special" snippets */ @@ -210,11 +210,13 @@ static void on_snippet_keybinding_activate(gchar *key) if (!s) { utils_beep(); - return; + return FALSE; } editor_insert_snippet(doc->editor, sci_get_current_position(doc->editor->sci), s); sci_scroll_caret(doc->editor->sci); + + return TRUE; } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] c32805: Some adjustmenys in javascript keywords: Deleted 'each' from secondary keywords
by Abel 'Akronix' Serrano Juste 11 Jan '17

11 Jan '17

Branch: refs/heads/master Author: Abel 'Akronix' Serrano Juste <akronix5(a)gmail.com> Committer: Abel 'Akronix' Serrano Juste <akronix5(a)gmail.com> Date: Wed, 11 Jan 2017 22:18:38 UTC Commit: c328051382385ea663eca73c1bb0aa1d969ef321 https://github.com/geany/geany/commit/c328051382385ea663eca73c1bb0aa1d969ef… Log Message: ----------- Some adjustmenys in javascript keywords: Deleted 'each' from secondary keywords Modified Paths: -------------- data/filedefs/filetypes.javascript Modified: data/filedefs/filetypes.javascript 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -3,7 +3,7 @@ [keywords] # all items must be in one line -primary=break case catch class const continue debugger default delete do each else enum export extends false finally for function get if import in Infinity instanceof let NaN new null return set static super switch this throw true try typeof undefined var void while with yield prototype async await +primary=break case catch class const continue debugger default delete do else enum export extends false finally for function get if import in Infinity instanceof let NaN new null return set static super switch this throw true try typeof undefined var void while with yield prototype async await secondary=Array Boolean Date Function Math Number Object String RegExp EvalError Error RangeError ReferenceError SyntaxError TypeError URIError constructor prototype decodeURI decodeURIComponent encodeURI encodeURIComponent eval isFinite isNaN parseFloat parseInt alert [settings] -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 6fad4c: Updated js keywords with ES6
by Abel 'Akronix' Serrano Juste 11 Jan '17

11 Jan '17

Branch: refs/heads/master Author: Abel 'Akronix' Serrano Juste <akronix5(a)gmail.com> Committer: Abel 'Akronix' Serrano Juste <akronix5(a)gmail.com> Date: Wed, 11 Jan 2017 22:05:05 UTC Commit: 6fad4c017cf6edcf03ddb78b82f0cfade0d26df7 https://github.com/geany/geany/commit/6fad4c017cf6edcf03ddb78b82f0cfade0d26… Log Message: ----------- Updated js keywords with ES6 Modified Paths: -------------- data/filedefs/filetypes.javascript Modified: data/filedefs/filetypes.javascript 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -3,8 +3,8 @@ [keywords] # all items must be in one line -primary=break case catch class const continue default delete do each else extends false finally for function get if in Infinity instanceof let NaN new null return set static super switch this throw true try typeof undefined var void while with yield prototype -secondary=Array Boolean Date Function Math Number Object String RegExp EvalError Error RangeError ReferenceError SyntaxError TypeError URIError constructor prototype decodeURI decodeURIComponent encodeURI encodeURIComponent eval isFinite isNaN parseFloat parseInt +primary=break case catch class const continue debugger default delete do each else enum export extends false finally for function get if import in Infinity instanceof let NaN new null return set static super switch this throw true try typeof undefined var void while with yield prototype async await +secondary=Array Boolean Date Function Math Number Object String RegExp EvalError Error RangeError ReferenceError SyntaxError TypeError URIError constructor prototype decodeURI decodeURIComponent encodeURI encodeURIComponent eval isFinite isNaN parseFloat parseInt alert [settings] # default extension used when saving files -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 1724ba: scripts/github-news: Fix issues link
by Colomban Wendling 11 Jan '17

11 Jan '17

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 11 Jan 2017 13:32:37 UTC Commit: 1724bab3b8048d8c37046f0128d85cf5bda523bf https://github.com/geany/geany/commit/1724bab3b8048d8c37046f0128d85cf5bda52… Log Message: ----------- scripts/github-news: Fix issues link Closes #1360. Modified Paths: -------------- scripts/github-news Modified: scripts/github-news 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -14,7 +14,7 @@ s/^ // s/^[A-Za-z0-9_-]/## \0/ # Turn PR and Issue references to links s%PR#\([0-9]\{1,\}\)%[\0](https://github.com/geany/geany/pull/\1)%g -s%Issue#\([0-9]\{1,\}\)%[\0](https://github.com/geany/geany/issue/\1)%g +s%Issue#\([0-9]\{1,\}\)%[\0](https://github.com/geany/geany/issues/\1)%g p n -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] d4a359: Fix snippets keybindings not blocking handled events
by Colomban Wendling 09 Jan '17

09 Jan '17

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 09 Jan 2017 13:42:20 UTC Commit: d4a35947d31fa1c150d90e3fd1cc6b060baed9a3 https://github.com/geany/geany/commit/d4a35947d31fa1c150d90e3fd1cc6b060baed… Log Message: ----------- Fix snippets keybindings not blocking handled events Fix signature of the snippets keybindings callback, properly blocking further propagation of handled events thus avoiding possibly activating another action (like a builtin Scintilla keybinding). Fixes #1354. Modified Paths: -------------- src/editor.c Modified: src/editor.c 8 lines changed, 5 insertions(+), 3 deletions(-) =================================================================== @@ -191,13 +191,13 @@ static void snippets_load(GKeyFile *sysconfig, GKeyFile *userconfig) } -static void on_snippet_keybinding_activate(gchar *key) +static gboolean on_snippet_keybinding_activate(gchar *key) { GeanyDocument *doc = document_get_current(); const gchar *s; if (!doc || !gtk_widget_has_focus(GTK_WIDGET(doc->editor->sci))) - return; + return FALSE; s = snippets_find_completion_by_name(doc->file_type->name, key); if (!s) /* allow user to specify keybindings for "special" snippets */ @@ -210,11 +210,13 @@ static void on_snippet_keybinding_activate(gchar *key) if (!s) { utils_beep(); - return; + return FALSE; } editor_insert_snippet(doc->editor, sci_get_current_position(doc->editor->sci), s); sci_scroll_caret(doc->editor->sci); + + return TRUE; } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 43b798: Merge pull request #1350 from kugel-/for-upstream
by Colomban Wendling 09 Jan '17

09 Jan '17

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 09 Jan 2017 13:18:16 UTC Commit: 43b7982b2efe48c858e902a14cf33ef57d428ec9 https://github.com/geany/geany/commit/43b7982b2efe48c858e902a14cf33ef57d428… Log Message: ----------- Merge pull request #1350 from kugel-/for-upstream api: rework GeanyProxyProbeResults compat symbols as defines Modified Paths: -------------- src/plugindata.h Modified: src/plugindata.h 30 lines changed, 15 insertions(+), 15 deletions(-) =================================================================== @@ -345,29 +345,17 @@ void geany_plugin_set_data(GeanyPlugin *plugin, gpointer data, GDestroyNotify fr */ typedef enum { - /** @deprecated Use GEANY_PROXY_IGNORE instead. - * @since 1.26 (API 226) - */ - PROXY_IGNORED, - /** @deprecated Use GEANY_PROXY_MATCH instead. - * @since 1.26 (API 226) - */ - PROXY_MATCHED, - /** @deprecated Use GEANY_PROXY_RELATED instead. - * @since 1.26 (API 226) - */ - PROXY_NOLOAD = 0x100, /** The proxy is not responsible at all, and Geany or other plugins are free * to probe it. * * @since 1.29 (API 229) **/ - GEANY_PROXY_IGNORE = PROXY_IGNORED, + GEANY_PROXY_IGNORE, /** The proxy is responsible for this file, and creates a plugin for it. * * @since 1.29 (API 229) */ - GEANY_PROXY_MATCH = PROXY_MATCHED, + GEANY_PROXY_MATCH, /** The proxy is does not directly load it, but it's still tied to the proxy. * * This is for plugins that come in multiple files where only one of these @@ -378,10 +366,22 @@ typedef enum * * @since 1.29 (API 229) */ - GEANY_PROXY_RELATED = PROXY_MATCHED | PROXY_NOLOAD + GEANY_PROXY_RELATED = GEANY_PROXY_MATCH | 0x100 } GeanyProxyProbeResults; +/** @deprecated Use GEANY_PROXY_IGNORE instead. + * @since 1.26 (API 226) + */ +#define PROXY_IGNORED GEANY_PROXY_IGNORE +/** @deprecated Use GEANY_PROXY_MATCH instead. + * @since 1.26 (API 226) + */ +#define PROXY_MATCHED GEANY_PROXY_MATCH +/** @deprecated Use GEANY_PROXY_RELATED instead. + * @since 1.26 (API 226) + */ +#define PROXY_NOLOAD 0x100 /** Hooks that need to be implemented by every proxy * -------------- 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 2017