Mercurial Repositories > eric / changeset

--- a/APIs/Python3/eric5.api	Sat Jun 28 16:26:02 2014 +0200
+++ b/APIs/Python3/eric5.api	Sun Jun 29 14:00:30 2014 +0200
@@ -665,6 +665,7 @@
 eric5.Debugger.DebugProtocol.ResponseVariable?7
 eric5.Debugger.DebugProtocol.ResponseVariables?7
 eric5.Debugger.DebugProtocol.ResponseWPConditionError?7
+eric5.Debugger.DebugServer.DebugServer.appendStdout?7
 eric5.Debugger.DebugServer.DebugServer.callTraceInfo?7
 eric5.Debugger.DebugServer.DebugServer.clientBanner?7
 eric5.Debugger.DebugServer.DebugServer.clientBreakConditionError?7
@@ -7169,6 +7170,7 @@
 eric5.QScintilla.Lexers.Lexer.Lexer.isStringStyle?4(style)
 eric5.QScintilla.Lexers.Lexer.Lexer.keywords?4(kwSet)
 eric5.QScintilla.Lexers.Lexer.Lexer.lexerName?4()
+eric5.QScintilla.Lexers.Lexer.Lexer.maximumKeywordSet?4()
 eric5.QScintilla.Lexers.Lexer.Lexer.smartIndentLine?4(editor)
 eric5.QScintilla.Lexers.Lexer.Lexer.smartIndentSelection?4(editor)
 eric5.QScintilla.Lexers.Lexer.Lexer.streamCommentStr?4()
@@ -7192,6 +7194,7 @@
 eric5.QScintilla.Lexers.LexerCPP.LexerCPP.initProperties?4()
 eric5.QScintilla.Lexers.LexerCPP.LexerCPP.isCommentStyle?4(style)
 eric5.QScintilla.Lexers.LexerCPP.LexerCPP.isStringStyle?4(style)
+eric5.QScintilla.Lexers.LexerCPP.LexerCPP.maximumKeywordSet?4()
 eric5.QScintilla.Lexers.LexerCPP.LexerCPP?1(parent=None, caseInsensitiveKeywords=False)
 eric5.QScintilla.Lexers.LexerCSS.LexerCSS.defaultKeywords?4(kwSet)
 eric5.QScintilla.Lexers.LexerCSS.LexerCSS.initProperties?4()
@@ -7202,12 +7205,14 @@
 eric5.QScintilla.Lexers.LexerCSharp.LexerCSharp.initProperties?4()
 eric5.QScintilla.Lexers.LexerCSharp.LexerCSharp.isCommentStyle?4(style)
 eric5.QScintilla.Lexers.LexerCSharp.LexerCSharp.isStringStyle?4(style)
+eric5.QScintilla.Lexers.LexerCSharp.LexerCSharp.maximumKeywordSet?4()
 eric5.QScintilla.Lexers.LexerCSharp.LexerCSharp?1(parent=None)
-eric5.QScintilla.Lexers.LexerCoffeeScript.LexerJavaScript.defaultKeywords?4(kwSet)
-eric5.QScintilla.Lexers.LexerCoffeeScript.LexerJavaScript.initProperties?4()
-eric5.QScintilla.Lexers.LexerCoffeeScript.LexerJavaScript.isCommentStyle?4(style)
-eric5.QScintilla.Lexers.LexerCoffeeScript.LexerJavaScript.isStringStyle?4(style)
-eric5.QScintilla.Lexers.LexerCoffeeScript.LexerJavaScript?1(parent=None)
+eric5.QScintilla.Lexers.LexerCoffeeScript.LexerCoffeeScript.defaultKeywords?4(kwSet)
+eric5.QScintilla.Lexers.LexerCoffeeScript.LexerCoffeeScript.initProperties?4()
+eric5.QScintilla.Lexers.LexerCoffeeScript.LexerCoffeeScript.isCommentStyle?4(style)
+eric5.QScintilla.Lexers.LexerCoffeeScript.LexerCoffeeScript.isStringStyle?4(style)
+eric5.QScintilla.Lexers.LexerCoffeeScript.LexerCoffeeScript.maximumKeywordSet?4()
+eric5.QScintilla.Lexers.LexerCoffeeScript.LexerCoffeeScript?1(parent=None)
 eric5.QScintilla.Lexers.LexerContainer.LexerContainer.description?4(style)
 eric5.QScintilla.Lexers.LexerContainer.LexerContainer.keywords?4(kwSet)
 eric5.QScintilla.Lexers.LexerContainer.LexerContainer.language?4()
@@ -7220,6 +7225,7 @@
 eric5.QScintilla.Lexers.LexerD.LexerD.initProperties?4()
 eric5.QScintilla.Lexers.LexerD.LexerD.isCommentStyle?4(style)
 eric5.QScintilla.Lexers.LexerD.LexerD.isStringStyle?4(style)
+eric5.QScintilla.Lexers.LexerD.LexerD.maximumKeywordSet?4()
 eric5.QScintilla.Lexers.LexerD.LexerD?1(parent=None)
 eric5.QScintilla.Lexers.LexerDiff.LexerDiff.defaultKeywords?4(kwSet)
 eric5.QScintilla.Lexers.LexerDiff.LexerDiff.isCommentStyle?4(style)
@@ -7246,22 +7252,26 @@
 eric5.QScintilla.Lexers.LexerIDL.LexerIDL.initProperties?4()
 eric5.QScintilla.Lexers.LexerIDL.LexerIDL.isCommentStyle?4(style)
 eric5.QScintilla.Lexers.LexerIDL.LexerIDL.isStringStyle?4(style)
+eric5.QScintilla.Lexers.LexerIDL.LexerIDL.maximumKeywordSet?4()
 eric5.QScintilla.Lexers.LexerIDL.LexerIDL?1(parent=None)
 eric5.QScintilla.Lexers.LexerJava.LexerJava.defaultKeywords?4(kwSet)
 eric5.QScintilla.Lexers.LexerJava.LexerJava.initProperties?4()
 eric5.QScintilla.Lexers.LexerJava.LexerJava.isCommentStyle?4(style)
 eric5.QScintilla.Lexers.LexerJava.LexerJava.isStringStyle?4(style)
+eric5.QScintilla.Lexers.LexerJava.LexerJava.maximumKeywordSet?4()
 eric5.QScintilla.Lexers.LexerJava.LexerJava?1(parent=None)
 eric5.QScintilla.Lexers.LexerJavaScript.LexerJavaScript.defaultKeywords?4(kwSet)
 eric5.QScintilla.Lexers.LexerJavaScript.LexerJavaScript.initProperties?4()
 eric5.QScintilla.Lexers.LexerJavaScript.LexerJavaScript.isCommentStyle?4(style)
 eric5.QScintilla.Lexers.LexerJavaScript.LexerJavaScript.isStringStyle?4(style)
+eric5.QScintilla.Lexers.LexerJavaScript.LexerJavaScript.maximumKeywordSet?4()
 eric5.QScintilla.Lexers.LexerJavaScript.LexerJavaScript?1(parent=None)
 eric5.QScintilla.Lexers.LexerLua.LexerLua.autoCompletionWordSeparators?4()
 eric5.QScintilla.Lexers.LexerLua.LexerLua.defaultKeywords?4(kwSet)
 eric5.QScintilla.Lexers.LexerLua.LexerLua.initProperties?4()
 eric5.QScintilla.Lexers.LexerLua.LexerLua.isCommentStyle?4(style)
 eric5.QScintilla.Lexers.LexerLua.LexerLua.isStringStyle?4(style)
+eric5.QScintilla.Lexers.LexerLua.LexerLua.maximumKeywordSet?4()
 eric5.QScintilla.Lexers.LexerLua.LexerLua?1(parent=None)
 eric5.QScintilla.Lexers.LexerMakefile.LexerMakefile.defaultKeywords?4(kwSet)
 eric5.QScintilla.Lexers.LexerMakefile.LexerMakefile.isCommentStyle?4(style)
@@ -7301,6 +7311,7 @@
 eric5.QScintilla.Lexers.LexerPostScript.LexerPostScript.initProperties?4()
 eric5.QScintilla.Lexers.LexerPostScript.LexerPostScript.isCommentStyle?4(style)
 eric5.QScintilla.Lexers.LexerPostScript.LexerPostScript.isStringStyle?4(style)
+eric5.QScintilla.Lexers.LexerPostScript.LexerPostScript.maximumKeywordSet?4()
 eric5.QScintilla.Lexers.LexerPostScript.LexerPostScript?1(parent=None)
 eric5.QScintilla.Lexers.LexerProperties.LexerProperties.defaultKeywords?4(kwSet)
 eric5.QScintilla.Lexers.LexerProperties.LexerProperties.initProperties?4()
@@ -7373,6 +7384,7 @@
 eric5.QScintilla.Lexers.LexerPython.LexerPython.isCommentStyle?4(style)
 eric5.QScintilla.Lexers.LexerPython.LexerPython.isStringStyle?4(style)
 eric5.QScintilla.Lexers.LexerPython.LexerPython.language?4()
+eric5.QScintilla.Lexers.LexerPython.LexerPython.maximumKeywordSet?4()
 eric5.QScintilla.Lexers.LexerPython.LexerPython?1(variant="", parent=None)
 eric5.QScintilla.Lexers.LexerQSS.LexerQSS.defaultKeywords?4(kwSet)
 eric5.QScintilla.Lexers.LexerQSS.LexerQSS.initProperties?4()
@@ -7392,11 +7404,13 @@
 eric5.QScintilla.Lexers.LexerSQL.LexerSQL.initProperties?4()
 eric5.QScintilla.Lexers.LexerSQL.LexerSQL.isCommentStyle?4(style)
 eric5.QScintilla.Lexers.LexerSQL.LexerSQL.isStringStyle?4(style)
+eric5.QScintilla.Lexers.LexerSQL.LexerSQL.maximumKeywordSet?4()
 eric5.QScintilla.Lexers.LexerSQL.LexerSQL?1(parent=None)
 eric5.QScintilla.Lexers.LexerTCL.LexerTCL.defaultKeywords?4(kwSet)
 eric5.QScintilla.Lexers.LexerTCL.LexerTCL.initProperties?4()
 eric5.QScintilla.Lexers.LexerTCL.LexerTCL.isCommentStyle?4(style)
 eric5.QScintilla.Lexers.LexerTCL.LexerTCL.isStringStyle?4(style)
+eric5.QScintilla.Lexers.LexerTCL.LexerTCL.maximumKeywordSet?4()
 eric5.QScintilla.Lexers.LexerTCL.LexerTCL?1(parent=None)
 eric5.QScintilla.Lexers.LexerTeX.LexerTeX.defaultKeywords?4(kwSet)
 eric5.QScintilla.Lexers.LexerTeX.LexerTeX.initProperties?4()
@@ -7407,6 +7421,7 @@
 eric5.QScintilla.Lexers.LexerVHDL.LexerVHDL.initProperties?4()
 eric5.QScintilla.Lexers.LexerVHDL.LexerVHDL.isCommentStyle?4(style)
 eric5.QScintilla.Lexers.LexerVHDL.LexerVHDL.isStringStyle?4(style)
+eric5.QScintilla.Lexers.LexerVHDL.LexerVHDL.maximumKeywordSet?4()
 eric5.QScintilla.Lexers.LexerVHDL.LexerVHDL?1(parent=None)
 eric5.QScintilla.Lexers.LexerXML.LexerXML.defaultKeywords?4(kwSet)
 eric5.QScintilla.Lexers.LexerXML.LexerXML.initProperties?4()

--- a/APIs/Python3/eric5.bas	Sat Jun 28 16:26:02 2014 +0200
+++ b/APIs/Python3/eric5.bas	Sun Jun 29 14:00:30 2014 +0200
@@ -402,6 +402,7 @@
 LexerCPP Lexer QsciLexerCPP
 LexerCSS Lexer QsciLexerCSS
 LexerCSharp Lexer QsciLexerCSharp
+LexerCoffeeScript Lexer QsciLexerCoffeeScript
 LexerContainer Lexer QsciLexer
 LexerD Lexer QsciLexerD
 LexerDiff Lexer QsciLexerDiff

Binary file Documentation/Help/source.qch has changed

--- a/Documentation/Help/source.qhp	Sat Jun 28 16:26:02 2014 +0200
+++ b/Documentation/Help/source.qhp	Sun Jun 29 14:00:30 2014 +0200
@@ -7277,6 +7277,7 @@
       <keyword name="Lexer.isStringStyle" id="Lexer.isStringStyle" ref="eric5.QScintilla.Lexers.Lexer.html#Lexer.isStringStyle" />
       <keyword name="Lexer.keywords" id="Lexer.keywords" ref="eric5.QScintilla.Lexers.Lexer.html#Lexer.keywords" />
       <keyword name="Lexer.lexerName" id="Lexer.lexerName" ref="eric5.QScintilla.Lexers.Lexer.html#Lexer.lexerName" />
+      <keyword name="Lexer.maximumKeywordSet" id="Lexer.maximumKeywordSet" ref="eric5.QScintilla.Lexers.Lexer.html#Lexer.maximumKeywordSet" />
       <keyword name="Lexer.smartIndentLine" id="Lexer.smartIndentLine" ref="eric5.QScintilla.Lexers.Lexer.html#Lexer.smartIndentLine" />
       <keyword name="Lexer.smartIndentSelection" id="Lexer.smartIndentSelection" ref="eric5.QScintilla.Lexers.Lexer.html#Lexer.smartIndentSelection" />
       <keyword name="Lexer.streamCommentStr" id="Lexer.streamCommentStr" ref="eric5.QScintilla.Lexers.Lexer.html#Lexer.streamCommentStr" />
@@ -7317,6 +7318,7 @@
       <keyword name="LexerCPP.initProperties" id="LexerCPP.initProperties" ref="eric5.QScintilla.Lexers.LexerCPP.html#LexerCPP.initProperties" />
       <keyword name="LexerCPP.isCommentStyle" id="LexerCPP.isCommentStyle" ref="eric5.QScintilla.Lexers.LexerCPP.html#LexerCPP.isCommentStyle" />
       <keyword name="LexerCPP.isStringStyle" id="LexerCPP.isStringStyle" ref="eric5.QScintilla.Lexers.LexerCPP.html#LexerCPP.isStringStyle" />
+      <keyword name="LexerCPP.maximumKeywordSet" id="LexerCPP.maximumKeywordSet" ref="eric5.QScintilla.Lexers.LexerCPP.html#LexerCPP.maximumKeywordSet" />
       <keyword name="LexerCSS" id="LexerCSS" ref="eric5.QScintilla.Lexers.LexerCSS.html#LexerCSS" />
       <keyword name="LexerCSS (Constructor)" id="LexerCSS (Constructor)" ref="eric5.QScintilla.Lexers.LexerCSS.html#LexerCSS.__init__" />
       <keyword name="LexerCSS (Module)" id="LexerCSS (Module)" ref="eric5.QScintilla.Lexers.LexerCSS.html" />
@@ -7331,7 +7333,15 @@
       <keyword name="LexerCSharp.initProperties" id="LexerCSharp.initProperties" ref="eric5.QScintilla.Lexers.LexerCSharp.html#LexerCSharp.initProperties" />
       <keyword name="LexerCSharp.isCommentStyle" id="LexerCSharp.isCommentStyle" ref="eric5.QScintilla.Lexers.LexerCSharp.html#LexerCSharp.isCommentStyle" />
       <keyword name="LexerCSharp.isStringStyle" id="LexerCSharp.isStringStyle" ref="eric5.QScintilla.Lexers.LexerCSharp.html#LexerCSharp.isStringStyle" />
+      <keyword name="LexerCSharp.maximumKeywordSet" id="LexerCSharp.maximumKeywordSet" ref="eric5.QScintilla.Lexers.LexerCSharp.html#LexerCSharp.maximumKeywordSet" />
+      <keyword name="LexerCoffeeScript" id="LexerCoffeeScript" ref="eric5.QScintilla.Lexers.LexerCoffeeScript.html#LexerCoffeeScript" />
+      <keyword name="LexerCoffeeScript (Constructor)" id="LexerCoffeeScript (Constructor)" ref="eric5.QScintilla.Lexers.LexerCoffeeScript.html#LexerCoffeeScript.__init__" />
       <keyword name="LexerCoffeeScript (Module)" id="LexerCoffeeScript (Module)" ref="eric5.QScintilla.Lexers.LexerCoffeeScript.html" />
+      <keyword name="LexerCoffeeScript.defaultKeywords" id="LexerCoffeeScript.defaultKeywords" ref="eric5.QScintilla.Lexers.LexerCoffeeScript.html#LexerCoffeeScript.defaultKeywords" />
+      <keyword name="LexerCoffeeScript.initProperties" id="LexerCoffeeScript.initProperties" ref="eric5.QScintilla.Lexers.LexerCoffeeScript.html#LexerCoffeeScript.initProperties" />
+      <keyword name="LexerCoffeeScript.isCommentStyle" id="LexerCoffeeScript.isCommentStyle" ref="eric5.QScintilla.Lexers.LexerCoffeeScript.html#LexerCoffeeScript.isCommentStyle" />
+      <keyword name="LexerCoffeeScript.isStringStyle" id="LexerCoffeeScript.isStringStyle" ref="eric5.QScintilla.Lexers.LexerCoffeeScript.html#LexerCoffeeScript.isStringStyle" />
+      <keyword name="LexerCoffeeScript.maximumKeywordSet" id="LexerCoffeeScript.maximumKeywordSet" ref="eric5.QScintilla.Lexers.LexerCoffeeScript.html#LexerCoffeeScript.maximumKeywordSet" />
       <keyword name="LexerContainer" id="LexerContainer" ref="eric5.QScintilla.Lexers.LexerContainer.html#LexerContainer" />
       <keyword name="LexerContainer (Constructor)" id="LexerContainer (Constructor)" ref="eric5.QScintilla.Lexers.LexerContainer.html#LexerContainer.__init__" />
       <keyword name="LexerContainer (Module)" id="LexerContainer (Module)" ref="eric5.QScintilla.Lexers.LexerContainer.html" />
@@ -7349,6 +7359,7 @@
       <keyword name="LexerD.initProperties" id="LexerD.initProperties" ref="eric5.QScintilla.Lexers.LexerD.html#LexerD.initProperties" />
       <keyword name="LexerD.isCommentStyle" id="LexerD.isCommentStyle" ref="eric5.QScintilla.Lexers.LexerD.html#LexerD.isCommentStyle" />
       <keyword name="LexerD.isStringStyle" id="LexerD.isStringStyle" ref="eric5.QScintilla.Lexers.LexerD.html#LexerD.isStringStyle" />
+      <keyword name="LexerD.maximumKeywordSet" id="LexerD.maximumKeywordSet" ref="eric5.QScintilla.Lexers.LexerD.html#LexerD.maximumKeywordSet" />
       <keyword name="LexerDiff" id="LexerDiff" ref="eric5.QScintilla.Lexers.LexerDiff.html#LexerDiff" />
       <keyword name="LexerDiff (Constructor)" id="LexerDiff (Constructor)" ref="eric5.QScintilla.Lexers.LexerDiff.html#LexerDiff.__init__" />
       <keyword name="LexerDiff (Module)" id="LexerDiff (Module)" ref="eric5.QScintilla.Lexers.LexerDiff.html" />
@@ -7385,6 +7396,7 @@
       <keyword name="LexerIDL.initProperties" id="LexerIDL.initProperties" ref="eric5.QScintilla.Lexers.LexerIDL.html#LexerIDL.initProperties" />
       <keyword name="LexerIDL.isCommentStyle" id="LexerIDL.isCommentStyle" ref="eric5.QScintilla.Lexers.LexerIDL.html#LexerIDL.isCommentStyle" />
       <keyword name="LexerIDL.isStringStyle" id="LexerIDL.isStringStyle" ref="eric5.QScintilla.Lexers.LexerIDL.html#LexerIDL.isStringStyle" />
+      <keyword name="LexerIDL.maximumKeywordSet" id="LexerIDL.maximumKeywordSet" ref="eric5.QScintilla.Lexers.LexerIDL.html#LexerIDL.maximumKeywordSet" />
       <keyword name="LexerJava" id="LexerJava" ref="eric5.QScintilla.Lexers.LexerJava.html#LexerJava" />
       <keyword name="LexerJava (Constructor)" id="LexerJava (Constructor)" ref="eric5.QScintilla.Lexers.LexerJava.html#LexerJava.__init__" />
       <keyword name="LexerJava (Module)" id="LexerJava (Module)" ref="eric5.QScintilla.Lexers.LexerJava.html" />
@@ -7392,19 +7404,15 @@
       <keyword name="LexerJava.initProperties" id="LexerJava.initProperties" ref="eric5.QScintilla.Lexers.LexerJava.html#LexerJava.initProperties" />
       <keyword name="LexerJava.isCommentStyle" id="LexerJava.isCommentStyle" ref="eric5.QScintilla.Lexers.LexerJava.html#LexerJava.isCommentStyle" />
       <keyword name="LexerJava.isStringStyle" id="LexerJava.isStringStyle" ref="eric5.QScintilla.Lexers.LexerJava.html#LexerJava.isStringStyle" />
-      <keyword name="LexerJavaScript" id="LexerJavaScript" ref="eric5.QScintilla.Lexers.LexerCoffeeScript.html#LexerJavaScript" />
+      <keyword name="LexerJava.maximumKeywordSet" id="LexerJava.maximumKeywordSet" ref="eric5.QScintilla.Lexers.LexerJava.html#LexerJava.maximumKeywordSet" />
       <keyword name="LexerJavaScript" id="LexerJavaScript" ref="eric5.QScintilla.Lexers.LexerJavaScript.html#LexerJavaScript" />
-      <keyword name="LexerJavaScript (Constructor)" id="LexerJavaScript (Constructor)" ref="eric5.QScintilla.Lexers.LexerCoffeeScript.html#LexerJavaScript.__init__" />
       <keyword name="LexerJavaScript (Constructor)" id="LexerJavaScript (Constructor)" ref="eric5.QScintilla.Lexers.LexerJavaScript.html#LexerJavaScript.__init__" />
       <keyword name="LexerJavaScript (Module)" id="LexerJavaScript (Module)" ref="eric5.QScintilla.Lexers.LexerJavaScript.html" />
-      <keyword name="LexerJavaScript.defaultKeywords" id="LexerJavaScript.defaultKeywords" ref="eric5.QScintilla.Lexers.LexerCoffeeScript.html#LexerJavaScript.defaultKeywords" />
       <keyword name="LexerJavaScript.defaultKeywords" id="LexerJavaScript.defaultKeywords" ref="eric5.QScintilla.Lexers.LexerJavaScript.html#LexerJavaScript.defaultKeywords" />
-      <keyword name="LexerJavaScript.initProperties" id="LexerJavaScript.initProperties" ref="eric5.QScintilla.Lexers.LexerCoffeeScript.html#LexerJavaScript.initProperties" />
       <keyword name="LexerJavaScript.initProperties" id="LexerJavaScript.initProperties" ref="eric5.QScintilla.Lexers.LexerJavaScript.html#LexerJavaScript.initProperties" />
-      <keyword name="LexerJavaScript.isCommentStyle" id="LexerJavaScript.isCommentStyle" ref="eric5.QScintilla.Lexers.LexerCoffeeScript.html#LexerJavaScript.isCommentStyle" />
       <keyword name="LexerJavaScript.isCommentStyle" id="LexerJavaScript.isCommentStyle" ref="eric5.QScintilla.Lexers.LexerJavaScript.html#LexerJavaScript.isCommentStyle" />
-      <keyword name="LexerJavaScript.isStringStyle" id="LexerJavaScript.isStringStyle" ref="eric5.QScintilla.Lexers.LexerCoffeeScript.html#LexerJavaScript.isStringStyle" />
       <keyword name="LexerJavaScript.isStringStyle" id="LexerJavaScript.isStringStyle" ref="eric5.QScintilla.Lexers.LexerJavaScript.html#LexerJavaScript.isStringStyle" />
+      <keyword name="LexerJavaScript.maximumKeywordSet" id="LexerJavaScript.maximumKeywordSet" ref="eric5.QScintilla.Lexers.LexerJavaScript.html#LexerJavaScript.maximumKeywordSet" />
       <keyword name="LexerLua" id="LexerLua" ref="eric5.QScintilla.Lexers.LexerLua.html#LexerLua" />
       <keyword name="LexerLua (Constructor)" id="LexerLua (Constructor)" ref="eric5.QScintilla.Lexers.LexerLua.html#LexerLua.__init__" />
       <keyword name="LexerLua (Module)" id="LexerLua (Module)" ref="eric5.QScintilla.Lexers.LexerLua.html" />
@@ -7413,6 +7421,7 @@
       <keyword name="LexerLua.initProperties" id="LexerLua.initProperties" ref="eric5.QScintilla.Lexers.LexerLua.html#LexerLua.initProperties" />
       <keyword name="LexerLua.isCommentStyle" id="LexerLua.isCommentStyle" ref="eric5.QScintilla.Lexers.LexerLua.html#LexerLua.isCommentStyle" />
       <keyword name="LexerLua.isStringStyle" id="LexerLua.isStringStyle" ref="eric5.QScintilla.Lexers.LexerLua.html#LexerLua.isStringStyle" />
+      <keyword name="LexerLua.maximumKeywordSet" id="LexerLua.maximumKeywordSet" ref="eric5.QScintilla.Lexers.LexerLua.html#LexerLua.maximumKeywordSet" />
       <keyword name="LexerMakefile" id="LexerMakefile" ref="eric5.QScintilla.Lexers.LexerMakefile.html#LexerMakefile" />
       <keyword name="LexerMakefile (Constructor)" id="LexerMakefile (Constructor)" ref="eric5.QScintilla.Lexers.LexerMakefile.html#LexerMakefile.__init__" />
       <keyword name="LexerMakefile (Module)" id="LexerMakefile (Module)" ref="eric5.QScintilla.Lexers.LexerMakefile.html" />
@@ -7468,6 +7477,7 @@
       <keyword name="LexerPostScript.initProperties" id="LexerPostScript.initProperties" ref="eric5.QScintilla.Lexers.LexerPostScript.html#LexerPostScript.initProperties" />
       <keyword name="LexerPostScript.isCommentStyle" id="LexerPostScript.isCommentStyle" ref="eric5.QScintilla.Lexers.LexerPostScript.html#LexerPostScript.isCommentStyle" />
       <keyword name="LexerPostScript.isStringStyle" id="LexerPostScript.isStringStyle" ref="eric5.QScintilla.Lexers.LexerPostScript.html#LexerPostScript.isStringStyle" />
+      <keyword name="LexerPostScript.maximumKeywordSet" id="LexerPostScript.maximumKeywordSet" ref="eric5.QScintilla.Lexers.LexerPostScript.html#LexerPostScript.maximumKeywordSet" />
       <keyword name="LexerProperties" id="LexerProperties" ref="eric5.QScintilla.Lexers.LexerProperties.html#LexerProperties" />
       <keyword name="LexerProperties (Constructor)" id="LexerProperties (Constructor)" ref="eric5.QScintilla.Lexers.LexerProperties.html#LexerProperties.__init__" />
       <keyword name="LexerProperties (Module)" id="LexerProperties (Module)" ref="eric5.QScintilla.Lexers.LexerProperties.html" />
@@ -7502,6 +7512,7 @@
       <keyword name="LexerPython.isCommentStyle" id="LexerPython.isCommentStyle" ref="eric5.QScintilla.Lexers.LexerPython.html#LexerPython.isCommentStyle" />
       <keyword name="LexerPython.isStringStyle" id="LexerPython.isStringStyle" ref="eric5.QScintilla.Lexers.LexerPython.html#LexerPython.isStringStyle" />
       <keyword name="LexerPython.language" id="LexerPython.language" ref="eric5.QScintilla.Lexers.LexerPython.html#LexerPython.language" />
+      <keyword name="LexerPython.maximumKeywordSet" id="LexerPython.maximumKeywordSet" ref="eric5.QScintilla.Lexers.LexerPython.html#LexerPython.maximumKeywordSet" />
       <keyword name="LexerQSS" id="LexerQSS" ref="eric5.QScintilla.Lexers.LexerQSS.html#LexerQSS" />
       <keyword name="LexerQSS (Constructor)" id="LexerQSS (Constructor)" ref="eric5.QScintilla.Lexers.LexerQSS.html#LexerQSS.__init__" />
       <keyword name="LexerQSS (Module)" id="LexerQSS (Module)" ref="eric5.QScintilla.Lexers.LexerQSS.html" />
@@ -7526,6 +7537,7 @@
       <keyword name="LexerSQL.initProperties" id="LexerSQL.initProperties" ref="eric5.QScintilla.Lexers.LexerSQL.html#LexerSQL.initProperties" />
       <keyword name="LexerSQL.isCommentStyle" id="LexerSQL.isCommentStyle" ref="eric5.QScintilla.Lexers.LexerSQL.html#LexerSQL.isCommentStyle" />
       <keyword name="LexerSQL.isStringStyle" id="LexerSQL.isStringStyle" ref="eric5.QScintilla.Lexers.LexerSQL.html#LexerSQL.isStringStyle" />
+      <keyword name="LexerSQL.maximumKeywordSet" id="LexerSQL.maximumKeywordSet" ref="eric5.QScintilla.Lexers.LexerSQL.html#LexerSQL.maximumKeywordSet" />
       <keyword name="LexerTCL" id="LexerTCL" ref="eric5.QScintilla.Lexers.LexerTCL.html#LexerTCL" />
       <keyword name="LexerTCL (Constructor)" id="LexerTCL (Constructor)" ref="eric5.QScintilla.Lexers.LexerTCL.html#LexerTCL.__init__" />
       <keyword name="LexerTCL (Module)" id="LexerTCL (Module)" ref="eric5.QScintilla.Lexers.LexerTCL.html" />
@@ -7533,6 +7545,7 @@
       <keyword name="LexerTCL.initProperties" id="LexerTCL.initProperties" ref="eric5.QScintilla.Lexers.LexerTCL.html#LexerTCL.initProperties" />
       <keyword name="LexerTCL.isCommentStyle" id="LexerTCL.isCommentStyle" ref="eric5.QScintilla.Lexers.LexerTCL.html#LexerTCL.isCommentStyle" />
       <keyword name="LexerTCL.isStringStyle" id="LexerTCL.isStringStyle" ref="eric5.QScintilla.Lexers.LexerTCL.html#LexerTCL.isStringStyle" />
+      <keyword name="LexerTCL.maximumKeywordSet" id="LexerTCL.maximumKeywordSet" ref="eric5.QScintilla.Lexers.LexerTCL.html#LexerTCL.maximumKeywordSet" />
       <keyword name="LexerTeX" id="LexerTeX" ref="eric5.QScintilla.Lexers.LexerTeX.html#LexerTeX" />
       <keyword name="LexerTeX (Constructor)" id="LexerTeX (Constructor)" ref="eric5.QScintilla.Lexers.LexerTeX.html#LexerTeX.__init__" />
       <keyword name="LexerTeX (Module)" id="LexerTeX (Module)" ref="eric5.QScintilla.Lexers.LexerTeX.html" />
@@ -7547,6 +7560,7 @@
       <keyword name="LexerVHDL.initProperties" id="LexerVHDL.initProperties" ref="eric5.QScintilla.Lexers.LexerVHDL.html#LexerVHDL.initProperties" />
       <keyword name="LexerVHDL.isCommentStyle" id="LexerVHDL.isCommentStyle" ref="eric5.QScintilla.Lexers.LexerVHDL.html#LexerVHDL.isCommentStyle" />
       <keyword name="LexerVHDL.isStringStyle" id="LexerVHDL.isStringStyle" ref="eric5.QScintilla.Lexers.LexerVHDL.html#LexerVHDL.isStringStyle" />
+      <keyword name="LexerVHDL.maximumKeywordSet" id="LexerVHDL.maximumKeywordSet" ref="eric5.QScintilla.Lexers.LexerVHDL.html#LexerVHDL.maximumKeywordSet" />
       <keyword name="LexerXML" id="LexerXML" ref="eric5.QScintilla.Lexers.LexerXML.html#LexerXML" />
       <keyword name="LexerXML (Constructor)" id="LexerXML (Constructor)" ref="eric5.QScintilla.Lexers.LexerXML.html#LexerXML.__init__" />
       <keyword name="LexerXML (Module)" id="LexerXML (Module)" ref="eric5.QScintilla.Lexers.LexerXML.html" />

--- a/Documentation/Source/eric5.Debugger.DebugServer.html	Sat Jun 28 16:26:02 2014 +0200
+++ b/Documentation/Source/eric5.Debugger.DebugServer.html	Sun Jun 29 14:00:30 2014 +0200
@@ -45,7 +45,11 @@
     Class implementing the debug server embedded within the IDE.
 </p><h3>Signals</h3>
 <dl>
-<dt>callTraceInfo</dt>
+<dt>appendStdout(msg)</dt>
+<dd>
+emitted when a passive debug connection is
+        established or lost
+</dd><dt>callTraceInfo</dt>
 <dd>
 emitted after the client reported the call trace
         data (isCall, fromFile, fromLine, fromFunction, toFile, toLine,

--- a/Documentation/Source/eric5.QScintilla.Lexers.Lexer.html	Sat Jun 28 16:26:02 2014 +0200
+++ b/Documentation/Source/eric5.QScintilla.Lexers.Lexer.html	Sun Jun 29 14:00:30 2014 +0200
@@ -99,6 +99,9 @@
 <td><a href="#Lexer.lexerName">lexerName</a></td>
 <td>Public method to return the lexer name.</td>
 </tr><tr>
+<td><a href="#Lexer.maximumKeywordSet">maximumKeywordSet</a></td>
+<td>Public method to get the maximum keyword set.</td>
+</tr><tr>
 <td><a href="#Lexer.smartIndentLine">smartIndentLine</a></td>
 <td>Public method to handle smart indentation for a line.</td>
 </tr><tr>
@@ -262,6 +265,18 @@
 <dd>
 lexer name (string)
 </dd>
+</dl><a NAME="Lexer.maximumKeywordSet" ID="Lexer.maximumKeywordSet"></a>
+<h4>Lexer.maximumKeywordSet</h4>
+<b>maximumKeywordSet</b>(<i></i>)
+<p>
+        Public method to get the maximum keyword set.
+</p><p>
+        Note: A return value of 0 indicates to determine this dynamically.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+maximum keyword set (integer)
+</dd>
 </dl><a NAME="Lexer.smartIndentLine" ID="Lexer.smartIndentLine"></a>
 <h4>Lexer.smartIndentLine</h4>
 <b>smartIndentLine</b>(<i>editor</i>)

--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerCPP.html	Sat Jun 28 16:26:02 2014 +0200
+++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerCPP.html	Sun Jun 29 14:00:30 2014 +0200
@@ -74,6 +74,9 @@
 </tr><tr>
 <td><a href="#LexerCPP.isStringStyle">isStringStyle</a></td>
 <td>Public method to check, if a style is a string style.</td>
+</tr><tr>
+<td><a href="#LexerCPP.maximumKeywordSet">maximumKeywordSet</a></td>
+<td>Public method to get the maximum keyword set.</td>
 </tr>
 </table>
 <h3>Static Methods</h3>
@@ -154,6 +157,16 @@
 <dd>
 flag indicating a string style (boolean)
 </dd>
+</dl><a NAME="LexerCPP.maximumKeywordSet" ID="LexerCPP.maximumKeywordSet"></a>
+<h4>LexerCPP.maximumKeywordSet</h4>
+<b>maximumKeywordSet</b>(<i></i>)
+<p>
+        Public method to get the maximum keyword set.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+maximum keyword set (integer)
+</dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>
 <hr />

--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerCSharp.html	Sat Jun 28 16:26:02 2014 +0200
+++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerCSharp.html	Sun Jun 29 14:00:30 2014 +0200
@@ -71,6 +71,9 @@
 </tr><tr>
 <td><a href="#LexerCSharp.isStringStyle">isStringStyle</a></td>
 <td>Public method to check, if a style is a string style.</td>
+</tr><tr>
+<td><a href="#LexerCSharp.maximumKeywordSet">maximumKeywordSet</a></td>
+<td>Public method to get the maximum keyword set.</td>
 </tr>
 </table>
 <h3>Static Methods</h3>
@@ -137,6 +140,16 @@
 <dd>
 flag indicating a string style (boolean)
 </dd>
+</dl><a NAME="LexerCSharp.maximumKeywordSet" ID="LexerCSharp.maximumKeywordSet"></a>
+<h4>LexerCSharp.maximumKeywordSet</h4>
+<b>maximumKeywordSet</b>(<i></i>)
+<p>
+        Public method to get the maximum keyword set.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+maximum keyword set (integer)
+</dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>
 <hr />

--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerCoffeeScript.html	Sat Jun 28 16:26:02 2014 +0200
+++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerCoffeeScript.html	Sun Jun 29 14:00:30 2014 +0200
@@ -30,7 +30,7 @@
 <h3>Classes</h3>
 <table>
 <tr>
-<td><a href="#LexerJavaScript">LexerJavaScript</a></td>
+<td><a href="#LexerCoffeeScript">LexerCoffeeScript</a></td>
 <td>Subclass to implement some additional lexer dependant methods.</td>
 </tr>
 </table>
@@ -39,13 +39,13 @@
 <tr><td>None</td></tr>
 </table>
 <hr /><hr />
-<a NAME="LexerJavaScript" ID="LexerJavaScript"></a>
-<h2>LexerJavaScript</h2>
+<a NAME="LexerCoffeeScript" ID="LexerCoffeeScript"></a>
+<h2>LexerCoffeeScript</h2>
 <p>
     Subclass to implement some additional lexer dependant methods.
 </p>
 <h3>Derived from</h3>
-Lexer, QsciLexerCoffeScript
+Lexer, QsciLexerCoffeeScript
 <h3>Class Attributes</h3>
 <table>
 <tr><td>None</td></tr>
@@ -57,29 +57,32 @@
 <h3>Methods</h3>
 <table>
 <tr>
-<td><a href="#LexerJavaScript.__init__">LexerJavaScript</a></td>
+<td><a href="#LexerCoffeeScript.__init__">LexerCoffeeScript</a></td>
 <td>Constructor</td>
 </tr><tr>
-<td><a href="#LexerJavaScript.defaultKeywords">defaultKeywords</a></td>
+<td><a href="#LexerCoffeeScript.defaultKeywords">defaultKeywords</a></td>
 <td>Public method to get the default keywords.</td>
 </tr><tr>
-<td><a href="#LexerJavaScript.initProperties">initProperties</a></td>
+<td><a href="#LexerCoffeeScript.initProperties">initProperties</a></td>
 <td>Public slot to initialize the properties.</td>
 </tr><tr>
-<td><a href="#LexerJavaScript.isCommentStyle">isCommentStyle</a></td>
+<td><a href="#LexerCoffeeScript.isCommentStyle">isCommentStyle</a></td>
 <td>Public method to check, if a style is a comment style.</td>
 </tr><tr>
-<td><a href="#LexerJavaScript.isStringStyle">isStringStyle</a></td>
+<td><a href="#LexerCoffeeScript.isStringStyle">isStringStyle</a></td>
 <td>Public method to check, if a style is a string style.</td>
+</tr><tr>
+<td><a href="#LexerCoffeeScript.maximumKeywordSet">maximumKeywordSet</a></td>
+<td>Public method to get the maximum keyword set.</td>
 </tr>
 </table>
 <h3>Static Methods</h3>
 <table>
 <tr><td>None</td></tr>
 </table>
-<a NAME="LexerJavaScript.__init__" ID="LexerJavaScript.__init__"></a>
-<h4>LexerJavaScript (Constructor)</h4>
-<b>LexerJavaScript</b>(<i>parent=None</i>)
+<a NAME="LexerCoffeeScript.__init__" ID="LexerCoffeeScript.__init__"></a>
+<h4>LexerCoffeeScript (Constructor)</h4>
+<b>LexerCoffeeScript</b>(<i>parent=None</i>)
 <p>
         Constructor
 </p><dl>
@@ -87,8 +90,8 @@
 <dd>
 parent widget of this lexer
 </dd>
-</dl><a NAME="LexerJavaScript.defaultKeywords" ID="LexerJavaScript.defaultKeywords"></a>
-<h4>LexerJavaScript.defaultKeywords</h4>
+</dl><a NAME="LexerCoffeeScript.defaultKeywords" ID="LexerCoffeeScript.defaultKeywords"></a>
+<h4>LexerCoffeeScript.defaultKeywords</h4>
 <b>defaultKeywords</b>(<i>kwSet</i>)
 <p>
         Public method to get the default keywords.
@@ -102,13 +105,13 @@
 <dd>
 string giving the keywords (string) or None
 </dd>
-</dl><a NAME="LexerJavaScript.initProperties" ID="LexerJavaScript.initProperties"></a>
-<h4>LexerJavaScript.initProperties</h4>
+</dl><a NAME="LexerCoffeeScript.initProperties" ID="LexerCoffeeScript.initProperties"></a>
+<h4>LexerCoffeeScript.initProperties</h4>
 <b>initProperties</b>(<i></i>)
 <p>
         Public slot to initialize the properties.
-</p><a NAME="LexerJavaScript.isCommentStyle" ID="LexerJavaScript.isCommentStyle"></a>
-<h4>LexerJavaScript.isCommentStyle</h4>
+</p><a NAME="LexerCoffeeScript.isCommentStyle" ID="LexerCoffeeScript.isCommentStyle"></a>
+<h4>LexerCoffeeScript.isCommentStyle</h4>
 <b>isCommentStyle</b>(<i>style</i>)
 <p>
         Public method to check, if a style is a comment style.
@@ -122,8 +125,8 @@
 <dd>
 flag indicating a comment style (boolean)
 </dd>
-</dl><a NAME="LexerJavaScript.isStringStyle" ID="LexerJavaScript.isStringStyle"></a>
-<h4>LexerJavaScript.isStringStyle</h4>
+</dl><a NAME="LexerCoffeeScript.isStringStyle" ID="LexerCoffeeScript.isStringStyle"></a>
+<h4>LexerCoffeeScript.isStringStyle</h4>
 <b>isStringStyle</b>(<i>style</i>)
 <p>
         Public method to check, if a style is a string style.
@@ -137,6 +140,16 @@
 <dd>
 flag indicating a string style (boolean)
 </dd>
+</dl><a NAME="LexerCoffeeScript.maximumKeywordSet" ID="LexerCoffeeScript.maximumKeywordSet"></a>
+<h4>LexerCoffeeScript.maximumKeywordSet</h4>
+<b>maximumKeywordSet</b>(<i></i>)
+<p>
+        Public method to get the maximum keyword set.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+maximum keyword set (integer)
+</dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>
 <hr />

--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerD.html	Sat Jun 28 16:26:02 2014 +0200
+++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerD.html	Sun Jun 29 14:00:30 2014 +0200
@@ -74,6 +74,9 @@
 </tr><tr>
 <td><a href="#LexerD.isStringStyle">isStringStyle</a></td>
 <td>Public method to check, if a style is a string style.</td>
+</tr><tr>
+<td><a href="#LexerD.maximumKeywordSet">maximumKeywordSet</a></td>
+<td>Public method to get the maximum keyword set.</td>
 </tr>
 </table>
 <h3>Static Methods</h3>
@@ -150,6 +153,16 @@
 <dd>
 flag indicating a string style (boolean)
 </dd>
+</dl><a NAME="LexerD.maximumKeywordSet" ID="LexerD.maximumKeywordSet"></a>
+<h4>LexerD.maximumKeywordSet</h4>
+<b>maximumKeywordSet</b>(<i></i>)
+<p>
+        Public method to get the maximum keyword set.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+maximum keyword set (integer)
+</dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>
 <hr />

--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerIDL.html	Sat Jun 28 16:26:02 2014 +0200
+++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerIDL.html	Sun Jun 29 14:00:30 2014 +0200
@@ -71,6 +71,9 @@
 </tr><tr>
 <td><a href="#LexerIDL.isStringStyle">isStringStyle</a></td>
 <td>Public method to check, if a style is a string style.</td>
+</tr><tr>
+<td><a href="#LexerIDL.maximumKeywordSet">maximumKeywordSet</a></td>
+<td>Public method to get the maximum keyword set.</td>
 </tr>
 </table>
 <h3>Static Methods</h3>
@@ -137,6 +140,16 @@
 <dd>
 flag indicating a string style (boolean)
 </dd>
+</dl><a NAME="LexerIDL.maximumKeywordSet" ID="LexerIDL.maximumKeywordSet"></a>
+<h4>LexerIDL.maximumKeywordSet</h4>
+<b>maximumKeywordSet</b>(<i></i>)
+<p>
+        Public method to get the maximum keyword set.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+maximum keyword set (integer)
+</dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>
 <hr />

--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerJava.html	Sat Jun 28 16:26:02 2014 +0200
+++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerJava.html	Sun Jun 29 14:00:30 2014 +0200
@@ -71,6 +71,9 @@
 </tr><tr>
 <td><a href="#LexerJava.isStringStyle">isStringStyle</a></td>
 <td>Public method to check, if a style is a string style.</td>
+</tr><tr>
+<td><a href="#LexerJava.maximumKeywordSet">maximumKeywordSet</a></td>
+<td>Public method to get the maximum keyword set.</td>
 </tr>
 </table>
 <h3>Static Methods</h3>
@@ -137,6 +140,16 @@
 <dd>
 flag indicating a string style (boolean)
 </dd>
+</dl><a NAME="LexerJava.maximumKeywordSet" ID="LexerJava.maximumKeywordSet"></a>
+<h4>LexerJava.maximumKeywordSet</h4>
+<b>maximumKeywordSet</b>(<i></i>)
+<p>
+        Public method to get the maximum keyword set.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+maximum keyword set (integer)
+</dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>
 <hr />

--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerJavaScript.html	Sat Jun 28 16:26:02 2014 +0200
+++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerJavaScript.html	Sun Jun 29 14:00:30 2014 +0200
@@ -71,6 +71,9 @@
 </tr><tr>
 <td><a href="#LexerJavaScript.isStringStyle">isStringStyle</a></td>
 <td>Public method to check, if a style is a string style.</td>
+</tr><tr>
+<td><a href="#LexerJavaScript.maximumKeywordSet">maximumKeywordSet</a></td>
+<td>Public method to get the maximum keyword set.</td>
 </tr>
 </table>
 <h3>Static Methods</h3>
@@ -137,6 +140,16 @@
 <dd>
 flag indicating a string style (boolean)
 </dd>
+</dl><a NAME="LexerJavaScript.maximumKeywordSet" ID="LexerJavaScript.maximumKeywordSet"></a>
+<h4>LexerJavaScript.maximumKeywordSet</h4>
+<b>maximumKeywordSet</b>(<i></i>)
+<p>
+        Public method to get the maximum keyword set.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+maximum keyword set (integer)
+</dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>
 <hr />

--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerLua.html	Sat Jun 28 16:26:02 2014 +0200
+++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerLua.html	Sun Jun 29 14:00:30 2014 +0200
@@ -74,6 +74,9 @@
 </tr><tr>
 <td><a href="#LexerLua.isStringStyle">isStringStyle</a></td>
 <td>Public method to check, if a style is a string style.</td>
+</tr><tr>
+<td><a href="#LexerLua.maximumKeywordSet">maximumKeywordSet</a></td>
+<td>Public method to get the maximum keyword set.</td>
 </tr>
 </table>
 <h3>Static Methods</h3>
@@ -150,6 +153,16 @@
 <dd>
 flag indicating a string style (boolean)
 </dd>
+</dl><a NAME="LexerLua.maximumKeywordSet" ID="LexerLua.maximumKeywordSet"></a>
+<h4>LexerLua.maximumKeywordSet</h4>
+<b>maximumKeywordSet</b>(<i></i>)
+<p>
+        Public method to get the maximum keyword set.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+maximum keyword set (integer)
+</dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>
 <hr />

--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerPostScript.html	Sat Jun 28 16:26:02 2014 +0200
+++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerPostScript.html	Sun Jun 29 14:00:30 2014 +0200
@@ -71,6 +71,9 @@
 </tr><tr>
 <td><a href="#LexerPostScript.isStringStyle">isStringStyle</a></td>
 <td>Public method to check, if a style is a string style.</td>
+</tr><tr>
+<td><a href="#LexerPostScript.maximumKeywordSet">maximumKeywordSet</a></td>
+<td>Public method to get the maximum keyword set.</td>
 </tr>
 </table>
 <h3>Static Methods</h3>
@@ -137,6 +140,16 @@
 <dd>
 flag indicating a string style (boolean)
 </dd>
+</dl><a NAME="LexerPostScript.maximumKeywordSet" ID="LexerPostScript.maximumKeywordSet"></a>
+<h4>LexerPostScript.maximumKeywordSet</h4>
+<b>maximumKeywordSet</b>(<i></i>)
+<p>
+        Public method to get the maximum keyword set.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+maximum keyword set (integer)
+</dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>
 <hr />

--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerPython.html	Sat Jun 28 16:26:02 2014 +0200
+++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerPython.html	Sun Jun 29 14:00:30 2014 +0200
@@ -80,6 +80,9 @@
 </tr><tr>
 <td><a href="#LexerPython.language">language</a></td>
 <td>Public method to get the lexer language.</td>
+</tr><tr>
+<td><a href="#LexerPython.maximumKeywordSet">maximumKeywordSet</a></td>
+<td>Public method to get the maximum keyword set.</td>
 </tr>
 </table>
 <h3>Static Methods</h3>
@@ -187,6 +190,16 @@
 <dd>
 lexer language (string)
 </dd>
+</dl><a NAME="LexerPython.maximumKeywordSet" ID="LexerPython.maximumKeywordSet"></a>
+<h4>LexerPython.maximumKeywordSet</h4>
+<b>maximumKeywordSet</b>(<i></i>)
+<p>
+        Public method to get the maximum keyword set.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+maximum keyword set (integer)
+</dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>
 <hr />

--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerSQL.html	Sat Jun 28 16:26:02 2014 +0200
+++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerSQL.html	Sun Jun 29 14:00:30 2014 +0200
@@ -71,6 +71,9 @@
 </tr><tr>
 <td><a href="#LexerSQL.isStringStyle">isStringStyle</a></td>
 <td>Public method to check, if a style is a string style.</td>
+</tr><tr>
+<td><a href="#LexerSQL.maximumKeywordSet">maximumKeywordSet</a></td>
+<td>Public method to get the maximum keyword set.</td>
 </tr>
 </table>
 <h3>Static Methods</h3>
@@ -137,6 +140,16 @@
 <dd>
 flag indicating a string style (boolean)
 </dd>
+</dl><a NAME="LexerSQL.maximumKeywordSet" ID="LexerSQL.maximumKeywordSet"></a>
+<h4>LexerSQL.maximumKeywordSet</h4>
+<b>maximumKeywordSet</b>(<i></i>)
+<p>
+        Public method to get the maximum keyword set.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+maximum keyword set (integer)
+</dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>
 <hr />

--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerTCL.html	Sat Jun 28 16:26:02 2014 +0200
+++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerTCL.html	Sun Jun 29 14:00:30 2014 +0200
@@ -71,6 +71,9 @@
 </tr><tr>
 <td><a href="#LexerTCL.isStringStyle">isStringStyle</a></td>
 <td>Public method to check, if a style is a string style.</td>
+</tr><tr>
+<td><a href="#LexerTCL.maximumKeywordSet">maximumKeywordSet</a></td>
+<td>Public method to get the maximum keyword set.</td>
 </tr>
 </table>
 <h3>Static Methods</h3>
@@ -137,6 +140,16 @@
 <dd>
 flag indicating a string style (boolean)
 </dd>
+</dl><a NAME="LexerTCL.maximumKeywordSet" ID="LexerTCL.maximumKeywordSet"></a>
+<h4>LexerTCL.maximumKeywordSet</h4>
+<b>maximumKeywordSet</b>(<i></i>)
+<p>
+        Public method to get the maximum keyword set.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+maximum keyword set (integer)
+</dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>
 <hr />

--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerVHDL.html	Sat Jun 28 16:26:02 2014 +0200
+++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerVHDL.html	Sun Jun 29 14:00:30 2014 +0200
@@ -71,6 +71,9 @@
 </tr><tr>
 <td><a href="#LexerVHDL.isStringStyle">isStringStyle</a></td>
 <td>Public method to check, if a style is a string style.</td>
+</tr><tr>
+<td><a href="#LexerVHDL.maximumKeywordSet">maximumKeywordSet</a></td>
+<td>Public method to get the maximum keyword set.</td>
 </tr>
 </table>
 <h3>Static Methods</h3>
@@ -137,6 +140,16 @@
 <dd>
 flag indicating a string style (boolean)
 </dd>
+</dl><a NAME="LexerVHDL.maximumKeywordSet" ID="LexerVHDL.maximumKeywordSet"></a>
+<h4>LexerVHDL.maximumKeywordSet</h4>
+<b>maximumKeywordSet</b>(<i></i>)
+<p>
+        Public method to get the maximum keyword set.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+maximum keyword set (integer)
+</dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>
 <hr />

--- a/Preferences/ConfigurationPages/EditorKeywordsPage.py	Sat Jun 28 16:26:02 2014 +0200
+++ b/Preferences/ConfigurationPages/EditorKeywordsPage.py	Sun Jun 29 14:00:30 2014 +0200
@@ -36,6 +36,10 @@
         self.__keywords = {
             "": ["", "", "", "", "", "", "", "", "", ""]
         }
+        self.__maxKeywordSets = {
+            "": 0
+        }
+        
         languages = sorted(
             [''] + list(QScintilla.Lexers.getSupportedLanguages().keys()))
         for lang in languages:
@@ -52,6 +56,7 @@
                             kw = ""
                         keywords.append(kw)
                 self.__keywords[lang] = keywords
+                self.__maxKeywordSets[lang] = lex.maximumKeywordSet()
             self.languageCombo.addItem(lang)
         
         self.currentLanguage = ''
@@ -81,13 +86,15 @@
         
         if self.setSpinBox.value() == 1:
             self.on_setSpinBox_valueChanged(1)
-        first, last = 10, 0
-        for kwSet in range(1, 10):
-            if self.__keywords[language][kwSet] != "":
-                first = min(first, kwSet)
-                last = max(last, kwSet)
-        if language in ["Python2", "Python3"] and last < 2:
-            last = 2    # support for keyword set 2 as of QScintilla 2.6.0
+        if self.__maxKeywordSets[language]:
+            first = 1
+            last = self.__maxKeywordSets[language]
+        else:
+            first, last = 10, 0
+            for kwSet in range(1, 10):
+                if self.__keywords[language][kwSet] != "":
+                    first = min(first, kwSet)
+                    last = max(last, kwSet)
         self.setSpinBox.setEnabled(language != "" and first < 10)
         self.keywordsEdit.setEnabled(language != "" and first < 10)
         if first < 10:

--- a/QScintilla/Lexers/Lexer.py	Sat Jun 28 16:26:02 2014 +0200
+++ b/QScintilla/Lexers/Lexer.py	Sun Jun 29 14:00:30 2014 +0200
@@ -226,6 +226,16 @@
         else:
             return self.defaultKeywords(kwSet)
     
+    def maximumKeywordSet(self):
+        """
+        Public method to get the maximum keyword set.
+        
+        Note: A return value of 0 indicates to determine this dynamically.
+        
+        @return maximum keyword set (integer)
+        """
+        return 0
+    
     def lexerName(self):
         """
         Public method to return the lexer name.

--- a/QScintilla/Lexers/LexerCPP.py	Sat Jun 28 16:26:02 2014 +0200
+++ b/QScintilla/Lexers/LexerCPP.py	Sun Jun 29 14:00:30 2014 +0200
@@ -115,3 +115,11 @@
         @return string giving the keywords (string) or None
         """
         return QsciLexerCPP.keywords(self, kwSet)
+    
+    def maximumKeywordSet(self):
+        """
+        Public method to get the maximum keyword set.
+        
+        @return maximum keyword set (integer)
+        """
+        return 4

--- a/QScintilla/Lexers/LexerCSharp.py	Sat Jun 28 16:26:02 2014 +0200
+++ b/QScintilla/Lexers/LexerCSharp.py	Sun Jun 29 14:00:30 2014 +0200
@@ -86,3 +86,11 @@
         @return string giving the keywords (string) or None
         """
         return QsciLexerCSharp.keywords(self, kwSet)
+    
+    def maximumKeywordSet(self):
+        """
+        Public method to get the maximum keyword set.
+        
+        @return maximum keyword set (integer)
+        """
+        return 4

--- a/QScintilla/Lexers/LexerCoffeeScript.py	Sat Jun 28 16:26:02 2014 +0200
+++ b/QScintilla/Lexers/LexerCoffeeScript.py	Sun Jun 29 14:00:30 2014 +0200
@@ -9,13 +9,13 @@
 
 from __future__ import unicode_literals
 
-from PyQt4.Qsci import QsciLexerCoffeScript
+from PyQt4.Qsci import QsciLexerCoffeeScript
 
 from .Lexer import Lexer
 import Preferences
 
 
-class LexerJavaScript(Lexer, QsciLexerCoffeScript):
+class LexerCoffeeScript(Lexer, QsciLexerCoffeeScript):
     """
     Subclass to implement some additional lexer dependant methods.
     """
@@ -25,7 +25,7 @@
         
         @param parent parent widget of this lexer
         """
-        QsciLexerCoffeScript.__init__(self, parent)
+        QsciLexerCoffeeScript.__init__(self, parent)
         Lexer.__init__(self)
         
         self.commentString = "#"
@@ -54,12 +54,12 @@
         @param style style to check (integer)
         @return flag indicating a comment style (boolean)
         """
-        return style in [QsciLexerCoffeScript.Comment,
-                         QsciLexerCoffeScript.CommentDoc,
-                         QsciLexerCoffeScript.CommentLine,
-                         QsciLexerCoffeScript.CommentLineDoc,
-                         QsciLexerCoffeScript.CommentBlock,
-                         QsciLexerCoffeScript.BlockRegexComment]
+        return style in [QsciLexerCoffeeScript.Comment,
+                         QsciLexerCoffeeScript.CommentDoc,
+                         QsciLexerCoffeeScript.CommentLine,
+                         QsciLexerCoffeeScript.CommentLineDoc,
+                         QsciLexerCoffeeScript.CommentBlock,
+                         QsciLexerCoffeeScript.BlockRegexComment]
     
     def isStringStyle(self, style):
         """
@@ -68,10 +68,10 @@
         @param style style to check (integer)
         @return flag indicating a string style (boolean)
         """
-        return style in [QsciLexerCoffeScript.DoubleQuotedString,
-                         QsciLexerCoffeScript.SingleQuotedString,
-                         QsciLexerCoffeScript.UnclosedString,
-                         QsciLexerCoffeScript.VerbatimString]
+        return style in [QsciLexerCoffeeScript.DoubleQuotedString,
+                         QsciLexerCoffeeScript.SingleQuotedString,
+                         QsciLexerCoffeeScript.UnclosedString,
+                         QsciLexerCoffeeScript.VerbatimString]
     
     def defaultKeywords(self, kwSet):
         """
@@ -80,4 +80,12 @@
         @param kwSet number of the keyword set (integer)
         @return string giving the keywords (string) or None
         """
-        return QsciLexerCoffeScript.keywords(self, kwSet)
+        return QsciLexerCoffeeScript.keywords(self, kwSet)
+    
+    def maximumKeywordSet(self):
+        """
+        Public method to get the maximum keyword set.
+        
+        @return maximum keyword set (integer)
+        """
+        return 4

--- a/QScintilla/Lexers/LexerD.py	Sat Jun 28 16:26:02 2014 +0200
+++ b/QScintilla/Lexers/LexerD.py	Sun Jun 29 14:00:30 2014 +0200
@@ -92,3 +92,11 @@
         @return string giving the keywords (string) or None
         """
         return QsciLexerD.keywords(self, kwSet)
+    
+    def maximumKeywordSet(self):
+        """
+        Public method to get the maximum keyword set.
+        
+        @return maximum keyword set (integer)
+        """
+        return 7

--- a/QScintilla/Lexers/LexerIDL.py	Sat Jun 28 16:26:02 2014 +0200
+++ b/QScintilla/Lexers/LexerIDL.py	Sun Jun 29 14:00:30 2014 +0200
@@ -86,3 +86,11 @@
         @return string giving the keywords (string) or None
         """
         return QsciLexerIDL.keywords(self, kwSet)
+    
+    def maximumKeywordSet(self):
+        """
+        Public method to get the maximum keyword set.
+        
+        @return maximum keyword set (integer)
+        """
+        return 4

--- a/QScintilla/Lexers/LexerJava.py	Sat Jun 28 16:26:02 2014 +0200
+++ b/QScintilla/Lexers/LexerJava.py	Sun Jun 29 14:00:30 2014 +0200
@@ -86,3 +86,11 @@
         @return string giving the keywords (string) or None
         """
         return QsciLexerJava.keywords(self, kwSet)
+    
+    def maximumKeywordSet(self):
+        """
+        Public method to get the maximum keyword set.
+        
+        @return maximum keyword set (integer)
+        """
+        return 4

--- a/QScintilla/Lexers/LexerJavaScript.py	Sat Jun 28 16:26:02 2014 +0200
+++ b/QScintilla/Lexers/LexerJavaScript.py	Sun Jun 29 14:00:30 2014 +0200
@@ -86,3 +86,11 @@
         @return string giving the keywords (string) or None
         """
         return QsciLexerJavaScript.keywords(self, kwSet)
+    
+    def maximumKeywordSet(self):
+        """
+        Public method to get the maximum keyword set.
+        
+        @return maximum keyword set (integer)
+        """
+        return 4

--- a/QScintilla/Lexers/LexerLua.py	Sat Jun 28 16:26:02 2014 +0200
+++ b/QScintilla/Lexers/LexerLua.py	Sun Jun 29 14:00:30 2014 +0200
@@ -77,3 +77,11 @@
         @return string giving the keywords (string) or None
         """
         return QsciLexerLua.keywords(self, kwSet)
+    
+    def maximumKeywordSet(self):
+        """
+        Public method to get the maximum keyword set.
+        
+        @return maximum keyword set (integer)
+        """
+        return 8

--- a/QScintilla/Lexers/LexerPostScript.py	Sat Jun 28 16:26:02 2014 +0200
+++ b/QScintilla/Lexers/LexerPostScript.py	Sun Jun 29 14:00:30 2014 +0200
@@ -65,3 +65,11 @@
         @return string giving the keywords (string) or None
         """
         return QsciLexerPostScript.keywords(self, kwSet)
+    
+    def maximumKeywordSet(self):
+        """
+        Public method to get the maximum keyword set.
+        
+        @return maximum keyword set (integer)
+        """
+        return 5

--- a/QScintilla/Lexers/LexerPython.py	Sat Jun 28 16:26:02 2014 +0200
+++ b/QScintilla/Lexers/LexerPython.py	Sun Jun 29 14:00:30 2014 +0200
@@ -156,3 +156,11 @@
         @return string giving the keywords (string) or None
         """
         return QsciLexerPython.keywords(self, kwSet)
+    
+    def maximumKeywordSet(self):
+        """
+        Public method to get the maximum keyword set.
+        
+        @return maximum keyword set (integer)
+        """
+        return 2

--- a/QScintilla/Lexers/LexerSQL.py	Sat Jun 28 16:26:02 2014 +0200
+++ b/QScintilla/Lexers/LexerSQL.py	Sun Jun 29 14:00:30 2014 +0200
@@ -77,3 +77,11 @@
         @return string giving the keywords (string) or None
         """
         return QsciLexerSQL.keywords(self, kwSet)
+    
+    def maximumKeywordSet(self):
+        """
+        Public method to get the maximum keyword set.
+        
+        @return maximum keyword set (integer)
+        """
+        return 8

--- a/QScintilla/Lexers/LexerTCL.py	Sat Jun 28 16:26:02 2014 +0200
+++ b/QScintilla/Lexers/LexerTCL.py	Sun Jun 29 14:00:30 2014 +0200
@@ -73,3 +73,11 @@
         @return string giving the keywords (string) or None
         """
         return QsciLexerTCL.keywords(self, kwSet)
+    
+    def maximumKeywordSet(self):
+        """
+        Public method to get the maximum keyword set.
+        
+        @return maximum keyword set (integer)
+        """
+        return 9

--- a/QScintilla/Lexers/LexerVHDL.py	Sat Jun 28 16:26:02 2014 +0200
+++ b/QScintilla/Lexers/LexerVHDL.py	Sun Jun 29 14:00:30 2014 +0200
@@ -69,3 +69,11 @@
         @return string giving the keywords (string) or None
         """
         return QsciLexerVHDL.keywords(self, kwSet)
+    
+    def maximumKeywordSet(self):
+        """
+        Public method to get the maximum keyword set.
+        
+        @return maximum keyword set (integer)
+        """
+        return 7

Binary file icons/default/languages/lexerCoffeeScript.png has changed