HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

editor: fix incorrect variable reference

Browse Source 
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.
This commit is contained in:
Thomas Martitz 2017-07-26 09:33:35 +02:00
parent 18360460ab
commit 18d524525d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/editor.c
View File

@ -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); gint line_start = sci_get_line_from_position(sci, insert_pos);
GString *buf; GString *buf;
const gchar *eol = editor_get_eol_char(editor); const gchar *eol = editor_get_eol_char(editor);
gint idx;
GSList *jump_locs, *item; GSList *jump_locs, *item;
g_return_if_fail(text); 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 /* count indent size up to insert_pos instead of asking sci
* because there may be spaces after it */ * because there may be spaces after it */
gchar *tmp = sci_get_line(sci, line_start); gchar *tmp = sci_get_line(sci, line_start);
gint idx;
idx = insert_pos - sci_get_position_from_line(sci, line_start); idx = insert_pos - sci_get_position_from_line(sci, line_start);
tmp[idx] = '\0'; 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 */ /* Set cursor to the requested index, or by default to after the snippet */
if (cursor_index >= 0) 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) else if (jump_locs == NULL)
sci_set_current_position(sci, insert_pos + buf->len, FALSE); sci_set_current_position(sci, insert_pos + buf->len, FALSE);