diff -r 519a21ddbc40 -r 5fac491d3a0e editors/CodeFileEditor.py
--- a/editors/CodeFileEditor.py	Tue May 14 11:23:43 2013 +0200
+++ b/editors/CodeFileEditor.py	Tue May 14 18:42:29 2013 +0200
@@ -303,9 +303,11 @@
             # Code completion
             else:
                 self.AutoCompSetIgnoreCase(False)  # so this needs to match
-
-                # Images are specified with a appended "?type"
-                self.AutoCompShow(0, " ".join([word + "?1" for word in self.KEYWORDS]))
+                
+                keywords = self.KEYWORDS + [var["Name"]
+                                            for var in self.Controler.GetVariables()]
+                keywords.sort()
+                self.AutoCompShow(0, " ".join(keywords))
         else:
             event.Skip()