Branch: refs/heads/master
Author: Colomban Wendling <lists.ban(a)herbesfolles.org>
Committer: Matthew Brush <mbrush(a)codebrainz.ca>
Date: Fri, 28 Jul 2017 04:15:55 UTC
Commit: 03e5bb9facd4e35ac0757781e054c7389362d129
https://github.com/geany/geany/commit/03e5bb9facd4e35ac0757781e054c7389362d…
Log Message:
-----------
Fix crash if plugin manager is opened more than once (#1564)
Do not allow more than one plugin manager dialog at a time. It doesn't
make sense and the code is not fully re-entrant and leads to a crash
toggling plugins in both dialogs.
Fixes #1563.
Modified Paths:
--------------
src/plugins.c
Modified: src/plugins.c
7 lines changed, 7 insertions(+), 0 deletions(-)
===================================================================
@@ -1902,6 +1902,7 @@ static void pm_dialog_response(GtkDialog *dialog, gint response, gpointer user_d
plugin_list = NULL;
}
gtk_widget_destroy(GTK_WIDGET(dialog));
+ pm_widgets.dialog = NULL;
configuration_save();
break;
@@ -1919,6 +1920,12 @@ static void pm_show_dialog(GtkMenuItem *menuitem, gpointer user_data)
{
GtkWidget *vbox, *vbox2, *swin, *label, *menu_item, *filter_entry;
+ if (pm_widgets.dialog != NULL)
+ {
+ gtk_window_present(GTK_WINDOW(pm_widgets.dialog));
+ return;
+ }
+
/* before showing the dialog, we need to create the list of available plugins */
load_all_plugins();
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Thomas Martitz <kugel(a)rockbox.org>
Committer: Thomas Martitz <kugel(a)rockbox.org>
Date: Wed, 26 Jul 2017 20:39:02 UTC
Commit: 18d524525df6612a8ab7fd690aa99d815c59f80d
https://github.com/geany/geany/commit/18d524525df6612a8ab7fd690aa99d815c59f…
Log Message:
-----------
editor: fix incorrect variable reference
The variable used for setting the cursor isn't used anymore and
was used uninitialized. It's simply deleted now and the correct var is used.
This was only a problem if editor_insert_text_block() was used directly,
the snippet code path doesn't reach to it.
Modified Paths:
--------------
src/editor.c
Modified: src/editor.c
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -2458,7 +2458,6 @@ void editor_insert_text_block(GeanyEditor *editor, const gchar *text, gint inser
gint line_start = sci_get_line_from_position(sci, insert_pos);
GString *buf;
const gchar *eol = editor_get_eol_char(editor);
- gint idx;
GSList *jump_locs, *item;
g_return_if_fail(text);
@@ -2475,6 +2474,7 @@ void editor_insert_text_block(GeanyEditor *editor, const gchar *text, gint inser
/* count indent size up to insert_pos instead of asking sci
* because there may be spaces after it */
gchar *tmp = sci_get_line(sci, line_start);
+ gint idx;
idx = insert_pos - sci_get_position_from_line(sci, line_start);
tmp[idx] = '\0';
@@ -2516,7 +2516,7 @@ void editor_insert_text_block(GeanyEditor *editor, const gchar *text, gint inser
/* Set cursor to the requested index, or by default to after the snippet */
if (cursor_index >= 0)
- sci_set_current_position(sci, insert_pos + idx, FALSE);
+ sci_set_current_position(sci, insert_pos + cursor_index, FALSE);
else if (jump_locs == NULL)
sci_set_current_position(sci, insert_pos + buf->len, FALSE);
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: klaxian <klaxian(a)gmail.com>
Committer: elextr <elextr(a)gmail.com>
Date: Fri, 21 Jul 2017 06:02:56 UTC
Commit: e0dd1ee109132f77a82794facced7b229193783d
https://github.com/geany/geany/commit/e0dd1ee109132f77a82794facced7b2291937…
Log Message:
-----------
Added missing PHP keywords, especially for PHP 7.x. (#1547)
Modified Paths:
--------------
data/filedefs/filetypes.html
Modified: data/filedefs/filetypes.html
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -81,7 +81,7 @@
javascript=abs abstract acos anchor asin atan atan2 big bold boolean break byte case catch ceil char charAt charCodeAt class concat const continue cos Date debugger default delete do double else enum escape eval exp export extends false final finally fixed float floor fontcolor fontsize for fromCharCode function goto if implements import in indexOf Infinity instanceof int interface isFinite isNaN italics join lastIndexOf length link log long Math max MAX_VALUE min MIN_VALUE NaN native NEGATIVE_INFINITY new null Number package parseFloat parseInt pop POSITIVE_INFINITY pow private protected public push random return reverse round shift short sin slice small sort splice split sqrt static strike string String sub substr substring sup super switch synchronized tan this throw throws toLowerCase toString toUpperCase transient true try typeof undefined unescape unshift valueOf var void volatile while with
vbscript=and as boolean byref byte byval call case class const continue currency date dim do double each else elseif empty end error exit false for function get global goto if in integer long loop me new next not nothing object on optional or private property public put redim rem resume select set single string sub then to true type until variant wend while with
python=and assert break class continue complex def del elif else except exec finally for from global if import in inherit is int lambda not or pass print raise return tuple try unicode while yield long float str list
-php=abstract and array as bool boolean break case catch cfunction __class__ class clone const continue declare default die __dir__ directory do double echo else elseif empty enddeclare endfor endforeach endif endswitch endwhile eval exception exit extends false __file__ final finally float for foreach __function__ function goto global if implements include include_once instanceof insteadof int integer interface isset __line__ list __method__ namespace __namespace__ new null object old_function or parent php_user_filter print private protected public real require require_once resource return self __sleep static stdclass string switch this throw trait true try unset use var __wakeup while xor yield
+php=abstract and argumentcounterror arithmeticerror array arrayaccess as assert assertionerror bool boolean break __call __callstatic callable case catch cfunction __class__ class clone __clone closure const __construct continue countable __debuginfo declare default __destruct die __dir__ directory divisionbyzeroerror do double echo else elseif empty enddeclare endfor endforeach endif endswitch endwhile error errorexception eval exception exit extends false __file__ final finally float for foreach __function__ function generator __get goto global __halt_compiler if implements include include_once instanceof insteadof int integer interface __invoke isset __isset iterable iterator iteratoraggregate __line__ list __method__ namespace __namespace__ new null object old_function or parent parseerror php_user_filter print private protected public real require require_once resource return self serializable __set __set_state __sleep static stdclass stderr stdin stdout string switch __tostring this throw throwable trait __trait__ traversable true try typeerror unset __unset use var void __wakeup while xor yield
sgml=ELEMENT DOCTYPE ATTLIST ENTITY NOTATION
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Vasiliy Faronov <vfaronov(a)gmail.com>
Committer: elextr <elextr(a)gmail.com>
Date: Fri, 21 Jul 2017 05:59:36 UTC
Commit: 2abf72a178301c6b90656229bbc11c9eb0b81765
https://github.com/geany/geany/commit/2abf72a178301c6b90656229bbc11c9eb0b81…
Log Message:
-----------
Push current position to navqueue before navigating back (#1537)
Modified Paths:
--------------
src/navqueue.c
Modified: src/navqueue.c
14 lines changed, 14 insertions(+), 0 deletions(-)
===================================================================
@@ -192,6 +192,20 @@ static gboolean goto_file_pos(const gchar *file, gint pos)
void navqueue_go_back(void)
{
filepos *fprev;
+ GeanyDocument *doc = document_get_current();
+
+ /* If the navqueue is currently at some position A, but the actual cursor is at some other
+ * place B, we should add B to the navqueue, so that (1) we go back to A, not to the next
+ * item in the queue; and (2) we can later restore B by going forward.
+ * (If A = B, add_new_position will ignore it.) */
+ if (doc)
+ {
+ if (doc->file_name)
+ add_new_position(doc->file_name, sci_get_current_position(doc->editor->sci));
+ }
+ else
+ /* see also https://github.com/geany/geany/pull/1537 */
+ g_warning("Attempted navigation when nothing is open");
/* return if theres no place to go back to */
if (g_queue_is_empty(navigation_queue) ||
--------------
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: Thu, 20 Jul 2017 05:08:24 UTC
Commit: 8b25d09978a5e37e2918a130add3a700111c6a0f
https://github.com/geany/geany/commit/8b25d09978a5e37e2918a130add3a700111c6…
Log Message:
-----------
Cython: Inherit lexer properties from the Python filetype
Modified Paths:
--------------
data/filedefs/filetypes.Cython.conf
Modified: data/filedefs/filetypes.Cython.conf
2 lines changed, 2 insertions(+), 0 deletions(-)
===================================================================
@@ -4,6 +4,8 @@
primary=and as assert break class continue def del elif else except exec finally for from global if import in is lambda not or pass print raise return try while with yield False None True api by cdef cimport cpdef ctypedef enum extern gil include inline nogil property public readonly struct union DEF IF ELIF ELSE NULL bint char Py_ssize_t short size_t void double int real long complex
identifiers=ArithmeticError AssertionError AttributeError BaseException BufferError BytesWarning DeprecationWarning EOFError Ellipsis EnvironmentError Exception False FloatingPointError FutureWarning GeneratorExit IOError ImportError ImportWarning IndentationError IndexError KeyError KeyboardInterrupt LookupError MemoryError NameError None NotImplemented NotImplementedError OSError OverflowError PendingDeprecationWarning ReferenceError RuntimeError RuntimeWarning StandardError StopIteration SyntaxError SyntaxWarning SystemError SystemExit TabError True TypeError UnboundLocalError UnicodeDecodeError UnicodeEncodeError UnicodeError UnicodeTranslateError UnicodeWarning UserWarning ValueError Warning ZeroDivisionError __debug__ __doc__ __import__ __name__ __package__ abs all any apply basestring bin bool buffer bytearray bytes callable chr classmethod cmp coerce compile complex copyright credits delattr dict dir divmod enumerate eval execfile exit file filter float format frozenset getattr globals hasattr hash help hex id input int intern isinstance issubclass iter len license list locals long map max min next object oct open ord pow print property quit range raw_input reduce reload repr reversed round set setattr slice sorted staticmethod str sum super tuple type unichr unicode vars xrange zip
+[lexer_properties=Python]
+
[settings]
lexer_filetype=Python
tag_parser=Python
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).