Revision: 5150 http://geany.svn.sourceforge.net/geany/?rev=5150&view=rev Author: ntrel Date: 2010-08-12 12:55:23 +0000 (Thu, 12 Aug 2010)
Log Message: ----------- r5123 | ntrel | 2010-08-10 17:12:24 +0100 (Tue, 10 Aug 2010) | 4 lines
Revert r4840 scope completion mode as it sometimes breaks autocompletion.
Modified Paths: -------------- branches/Geany-0_19_1/ChangeLog branches/Geany-0_19_1/src/editor.c
Modified: branches/Geany-0_19_1/ChangeLog =================================================================== --- branches/Geany-0_19_1/ChangeLog 2010-08-12 12:51:51 UTC (rev 5149) +++ branches/Geany-0_19_1/ChangeLog 2010-08-12 12:55:23 UTC (rev 5150) @@ -1,3 +1,10 @@ +2010-08-10 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/editor.c: + Revert r4840 scope completion mode as it sometimes breaks + autocompletion. + + 2010-08-05 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* src/ui_utils.c, src/ui_utils.h:
Modified: branches/Geany-0_19_1/src/editor.c =================================================================== --- branches/Geany-0_19_1/src/editor.c 2010-08-12 12:51:51 UTC (rev 5149) +++ branches/Geany-0_19_1/src/editor.c 2010-08-12 12:55:23 UTC (rev 5150) @@ -95,14 +95,6 @@ ScintillaObject *sci; } calltip = {NULL, FALSE, NULL, 0, 0, NULL};
-static enum -{ - AUTOC_CANCELLED, - AUTOC_SCOPE, - AUTOC_TAGS, - AUTOC_DOC_WORDS -} autocompletion_mode = AUTOC_CANCELLED; - static gchar indent[100];
@@ -603,10 +595,7 @@ tags = tm_workspace_find_scope_members(obj ? obj->tags_array : NULL, name, TRUE, FALSE); if (tags) - { - autocompletion_mode = AUTOC_SCOPE; show_tags_list(editor, tags, 0); - } } }
@@ -958,7 +947,6 @@ case SCN_AUTOCCANCELLED: /* now that autocomplete is finishing or was cancelled, reshow calltips * if they were showing */ - autocompletion_mode = AUTOC_CANCELLED; request_reshowing_calltip(nt); break;
@@ -1807,7 +1795,6 @@ tags = tm_workspace_find(root, tm_tag_max_t, attrs, TRUE, doc->file_type->lang); if (tags) { - autocompletion_mode = AUTOC_TAGS; show_tags_list(editor, tags, rootlen); return tags->len > 0; } @@ -1947,7 +1934,6 @@ g_slist_free(list); g_string_free(words, TRUE);
- autocompletion_mode = AUTOC_DOC_WORDS; show_autocomplete(sci, rootlen, str->str); g_string_free(str, TRUE); return TRUE; @@ -2007,7 +1993,7 @@ root = linebuf + startword; rootlen = current - startword;
- if (rootlen > 0 && autocompletion_mode != AUTOC_SCOPE) + if (rootlen > 0) { if (autocomplete_check_for_html(ft->id, style)) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.