SF.net SVN: geany: [2634] trunk

[ntrel at users.sourceforge.net]

Revision: 2634
          http://geany.svn.sourceforge.net/geany/?rev=2634&view=rev
Author:   ntrel
Date:     2008-06-02 09:05:03 -0700 (Mon, 02 Jun 2008)

Log Message:
-----------
Cancel any autocompletion list when completing a snippet.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/editor.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-06-02 15:52:00 UTC (rev 2633)
+++ trunk/ChangeLog	2008-06-02 16:05:03 UTC (rev 2634)
@@ -16,6 +16,8 @@
    (waiting was not related to the now fixed reload-colourise problem).
  * src/document.c:
    Fix possible document double-colourise after reloading a file.
+ * src/editor.c:
+   Cancel any autocompletion list when completing a snippet.
 
 
 2008-05-30  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: trunk/src/editor.c
===================================================================
--- trunk/src/editor.c	2008-06-02 15:52:00 UTC (rev 2633)
+++ trunk/src/editor.c	2008-06-02 16:05:03 UTC (rev 2634)
@@ -1474,6 +1474,8 @@
 		sci_start_undo_action(sci);	/* needed because we insert a space separately from construct */
 		result = snippets_complete_constructs(idx, pos, current_word);
 		sci_end_undo_action(sci);
+		if (result)
+			SSM(sci, SCI_CANCEL, 0, 0);	/* cancel any autocompletion list, etc */
 	}
 
 	g_free(wc);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.