SF.net SVN: geany:[3932] trunk/src/editor.c

[ntrel at users.sourceforge.net]

Revision: 3932
          http://geany.svn.sourceforge.net/geany/?rev=3932&view=rev
Author:   ntrel
Date:     2009-07-08 15:47:38 +0000 (Wed, 08 Jul 2009)

Log Message:
-----------
Ignore autocompletion in D WYSIWYG strings.

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

Modified: trunk/src/editor.c
===================================================================
--- trunk/src/editor.c	2009-07-08 15:39:07 UTC (rev 3931)
+++ trunk/src/editor.c	2009-07-08 15:47:38 UTC (rev 3932)
@@ -1725,7 +1725,7 @@
 
 
 /* Algorithm based on based on Scite's StartAutoCompleteWord() */
-static gboolean complete_doc_word(GeanyEditor *editor, gchar *root, gsize rootlen)
+static gboolean autocomplete_doc_word(GeanyEditor *editor, gchar *root, gsize rootlen)
 {
 	ScintillaObject *sci = editor->sci;
 	gchar *word;
@@ -1869,7 +1869,7 @@
 				ret = autocomplete_tags(editor, root, rootlen);
 				/* If forcing and there's nothing else to show, complete from words in document */
 				if (!ret && (force || editor_prefs.autocomplete_doc_words))
-					ret = complete_doc_word(editor, root, rootlen);
+					ret = autocomplete_doc_word(editor, root, rootlen);
 			}
 		}
 	}
@@ -3172,9 +3172,11 @@
 				style == SCE_PAS_STRINGEOL);
 
 		case SCLEX_D:
-			return (style == SCE_D_CHARACTER ||
-				style == SCE_D_STRING ||
-				style == SCE_D_STRINGEOL);
+			return (style == SCE_D_STRING ||
+				style == SCE_D_STRINGEOL ||
+				style == SCE_D_CHARACTER ||
+				style == SCE_D_STRINGB ||
+				style == SCE_D_STRINGR);
 
 		case SCLEX_PYTHON:
 			return (style == SCE_P_STRING ||


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