Mercurial Repositories > eric / changeset

--- a/APIs/Python3/eric5.api	Thu Apr 01 09:38:39 2010 +0000
+++ b/APIs/Python3/eric5.api	Fri Apr 02 13:57:06 2010 +0000
@@ -4560,6 +4560,7 @@
 eric5.QScintilla.Lexers.LexerPygments.LexerPygments.canStyle?4()
 eric5.QScintilla.Lexers.LexerPygments.LexerPygments.defaultColor?4(style)
 eric5.QScintilla.Lexers.LexerPygments.LexerPygments.defaultFont?4(style)
+eric5.QScintilla.Lexers.LexerPygments.LexerPygments.defaultKeywords?4(kwSet)
 eric5.QScintilla.Lexers.LexerPygments.LexerPygments.defaultPaper?4(style)
 eric5.QScintilla.Lexers.LexerPygments.LexerPygments.description?4(style)
 eric5.QScintilla.Lexers.LexerPygments.LexerPygments.isCommentStyle?4(style)

Binary file Documentation/Help/source.qch has changed

--- a/Documentation/Help/source.qhp	Thu Apr 01 09:38:39 2010 +0000
+++ b/Documentation/Help/source.qhp	Fri Apr 02 13:57:06 2010 +0000
@@ -8992,6 +8992,7 @@
       <keyword name="LexerPygments.canStyle" id="LexerPygments.canStyle" ref="eric5.QScintilla.Lexers.LexerPygments.html#LexerPygments.canStyle" />
       <keyword name="LexerPygments.defaultColor" id="LexerPygments.defaultColor" ref="eric5.QScintilla.Lexers.LexerPygments.html#LexerPygments.defaultColor" />
       <keyword name="LexerPygments.defaultFont" id="LexerPygments.defaultFont" ref="eric5.QScintilla.Lexers.LexerPygments.html#LexerPygments.defaultFont" />
+      <keyword name="LexerPygments.defaultKeywords" id="LexerPygments.defaultKeywords" ref="eric5.QScintilla.Lexers.LexerPygments.html#LexerPygments.defaultKeywords" />
       <keyword name="LexerPygments.defaultPaper" id="LexerPygments.defaultPaper" ref="eric5.QScintilla.Lexers.LexerPygments.html#LexerPygments.defaultPaper" />
       <keyword name="LexerPygments.description" id="LexerPygments.description" ref="eric5.QScintilla.Lexers.LexerPygments.html#LexerPygments.description" />
       <keyword name="LexerPygments.isCommentStyle" id="LexerPygments.isCommentStyle" ref="eric5.QScintilla.Lexers.LexerPygments.html#LexerPygments.isCommentStyle" />

--- a/Documentation/Source/eric5.QScintilla.Lexers.Lexer.html	Thu Apr 01 09:38:39 2010 +0000
+++ b/Documentation/Source/eric5.QScintilla.Lexers.Lexer.html	Fri Apr 02 13:57:06 2010 +0000
@@ -226,6 +226,11 @@
 <dd>
 number of the keyword set (integer)
 </dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+string giving the keywords (string) or None
+</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.LexerBash.html	Thu Apr 01 09:38:39 2010 +0000
+++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerBash.html	Fri Apr 02 13:57:06 2010 +0000
@@ -92,6 +92,11 @@
 <dd>
 number of the keyword set (integer)
 </dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+string giving the keywords (string) or None
+</dd>
 </dl><a NAME="LexerBash.initProperties" ID="LexerBash.initProperties"></a>
 <h4>LexerBash.initProperties</h4>
 <b>initProperties</b>(<i></i>)

--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerBatch.html	Thu Apr 01 09:38:39 2010 +0000
+++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerBatch.html	Fri Apr 02 13:57:06 2010 +0000
@@ -89,6 +89,11 @@
 <dd>
 number of the keyword set (integer)
 </dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+string giving the keywords (string) or None
+</dd>
 </dl><a NAME="LexerBatch.isCommentStyle" ID="LexerBatch.isCommentStyle"></a>
 <h4>LexerBatch.isCommentStyle</h4>
 <b>isCommentStyle</b>(<i>style</i>)

--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerCMake.html	Thu Apr 01 09:38:39 2010 +0000
+++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerCMake.html	Fri Apr 02 13:57:06 2010 +0000
@@ -92,6 +92,11 @@
 <dd>
 number of the keyword set (integer)
 </dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+string giving the keywords (string) or None
+</dd>
 </dl><a NAME="LexerCMake.initProperties" ID="LexerCMake.initProperties"></a>
 <h4>LexerCMake.initProperties</h4>
 <b>initProperties</b>(<i></i>)

--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerCPP.html	Thu Apr 01 09:38:39 2010 +0000
+++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerCPP.html	Fri Apr 02 13:57:06 2010 +0000
@@ -105,6 +105,11 @@
 <dd>
 number of the keyword set (integer)
 </dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+string giving the keywords (string) or None
+</dd>
 </dl><a NAME="LexerCPP.initProperties" ID="LexerCPP.initProperties"></a>
 <h4>LexerCPP.initProperties</h4>
 <b>initProperties</b>(<i></i>)

--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerCSS.html	Thu Apr 01 09:38:39 2010 +0000
+++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerCSS.html	Fri Apr 02 13:57:06 2010 +0000
@@ -92,6 +92,11 @@
 <dd>
 number of the keyword set (integer)
 </dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+string giving the keywords (string) or None
+</dd>
 </dl><a NAME="LexerCSS.initProperties" ID="LexerCSS.initProperties"></a>
 <h4>LexerCSS.initProperties</h4>
 <b>initProperties</b>(<i></i>)

--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerCSharp.html	Thu Apr 01 09:38:39 2010 +0000
+++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerCSharp.html	Fri Apr 02 13:57:06 2010 +0000
@@ -92,6 +92,11 @@
 <dd>
 number of the keyword set (integer)
 </dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+string giving the keywords (string) or None
+</dd>
 </dl><a NAME="LexerCSharp.initProperties" ID="LexerCSharp.initProperties"></a>
 <h4>LexerCSharp.initProperties</h4>
 <b>initProperties</b>(<i></i>)

--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerD.html	Thu Apr 01 09:38:39 2010 +0000
+++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerD.html	Fri Apr 02 13:57:06 2010 +0000
@@ -105,6 +105,11 @@
 <dd>
 number of the keyword set (integer)
 </dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+string giving the keywords (string) or None
+</dd>
 </dl><a NAME="LexerD.initProperties" ID="LexerD.initProperties"></a>
 <h4>LexerD.initProperties</h4>
 <b>initProperties</b>(<i></i>)

--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerDiff.html	Thu Apr 01 09:38:39 2010 +0000
+++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerDiff.html	Fri Apr 02 13:57:06 2010 +0000
@@ -89,6 +89,11 @@
 <dd>
 number of the keyword set (integer)
 </dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+string giving the keywords (string) or None
+</dd>
 </dl><a NAME="LexerDiff.isCommentStyle" ID="LexerDiff.isCommentStyle"></a>
 <h4>LexerDiff.isCommentStyle</h4>
 <b>isCommentStyle</b>(<i>style</i>)

--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerFortran.html	Thu Apr 01 09:38:39 2010 +0000
+++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerFortran.html	Fri Apr 02 13:57:06 2010 +0000
@@ -105,6 +105,11 @@
 <dd>
 number of the keyword set (integer)
 </dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+string giving the keywords (string) or None
+</dd>
 </dl><a NAME="LexerFortran.initProperties" ID="LexerFortran.initProperties"></a>
 <h4>LexerFortran.initProperties</h4>
 <b>initProperties</b>(<i></i>)

--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerFortran77.html	Thu Apr 01 09:38:39 2010 +0000
+++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerFortran77.html	Fri Apr 02 13:57:06 2010 +0000
@@ -105,6 +105,11 @@
 <dd>
 number of the keyword set (integer)
 </dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+string giving the keywords (string) or None
+</dd>
 </dl><a NAME="LexerFortran77.initProperties" ID="LexerFortran77.initProperties"></a>
 <h4>LexerFortran77.initProperties</h4>
 <b>initProperties</b>(<i></i>)

--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerHTML.html	Thu Apr 01 09:38:39 2010 +0000
+++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerHTML.html	Fri Apr 02 13:57:06 2010 +0000
@@ -92,6 +92,11 @@
 <dd>
 number of the keyword set (integer)
 </dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+string giving the keywords (string) or None
+</dd>
 </dl><a NAME="LexerHTML.initProperties" ID="LexerHTML.initProperties"></a>
 <h4>LexerHTML.initProperties</h4>
 <b>initProperties</b>(<i></i>)

--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerIDL.html	Thu Apr 01 09:38:39 2010 +0000
+++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerIDL.html	Fri Apr 02 13:57:06 2010 +0000
@@ -92,6 +92,11 @@
 <dd>
 number of the keyword set (integer)
 </dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+string giving the keywords (string) or None
+</dd>
 </dl><a NAME="LexerIDL.initProperties" ID="LexerIDL.initProperties"></a>
 <h4>LexerIDL.initProperties</h4>
 <b>initProperties</b>(<i></i>)

--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerJava.html	Thu Apr 01 09:38:39 2010 +0000
+++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerJava.html	Fri Apr 02 13:57:06 2010 +0000
@@ -92,6 +92,11 @@
 <dd>
 number of the keyword set (integer)
 </dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+string giving the keywords (string) or None
+</dd>
 </dl><a NAME="LexerJava.initProperties" ID="LexerJava.initProperties"></a>
 <h4>LexerJava.initProperties</h4>
 <b>initProperties</b>(<i></i>)

--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerJavaScript.html	Thu Apr 01 09:38:39 2010 +0000
+++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerJavaScript.html	Fri Apr 02 13:57:06 2010 +0000
@@ -92,6 +92,11 @@
 <dd>
 number of the keyword set (integer)
 </dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+string giving the keywords (string) or None
+</dd>
 </dl><a NAME="LexerJavaScript.initProperties" ID="LexerJavaScript.initProperties"></a>
 <h4>LexerJavaScript.initProperties</h4>
 <b>initProperties</b>(<i></i>)

--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerLua.html	Thu Apr 01 09:38:39 2010 +0000
+++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerLua.html	Fri Apr 02 13:57:06 2010 +0000
@@ -105,6 +105,11 @@
 <dd>
 number of the keyword set (integer)
 </dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+string giving the keywords (string) or None
+</dd>
 </dl><a NAME="LexerLua.initProperties" ID="LexerLua.initProperties"></a>
 <h4>LexerLua.initProperties</h4>
 <b>initProperties</b>(<i></i>)

--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerMakefile.html	Thu Apr 01 09:38:39 2010 +0000
+++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerMakefile.html	Fri Apr 02 13:57:06 2010 +0000
@@ -89,6 +89,11 @@
 <dd>
 number of the keyword set (integer)
 </dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+string giving the keywords (string) or None
+</dd>
 </dl><a NAME="LexerMakefile.isCommentStyle" ID="LexerMakefile.isCommentStyle"></a>
 <h4>LexerMakefile.isCommentStyle</h4>
 <b>isCommentStyle</b>(<i>style</i>)

--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerPOV.html	Thu Apr 01 09:38:39 2010 +0000
+++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerPOV.html	Fri Apr 02 13:57:06 2010 +0000
@@ -92,6 +92,11 @@
 <dd>
 number of the keyword set (integer)
 </dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+string giving the keywords (string) or None
+</dd>
 </dl><a NAME="LexerPOV.initProperties" ID="LexerPOV.initProperties"></a>
 <h4>LexerPOV.initProperties</h4>
 <b>initProperties</b>(<i></i>)

--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerPascal.html	Thu Apr 01 09:38:39 2010 +0000
+++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerPascal.html	Fri Apr 02 13:57:06 2010 +0000
@@ -105,6 +105,11 @@
 <dd>
 number of the keyword set (integer)
 </dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+string giving the keywords (string) or None
+</dd>
 </dl><a NAME="LexerPascal.initProperties" ID="LexerPascal.initProperties"></a>
 <h4>LexerPascal.initProperties</h4>
 <b>initProperties</b>(<i></i>)

--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerPerl.html	Thu Apr 01 09:38:39 2010 +0000
+++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerPerl.html	Fri Apr 02 13:57:06 2010 +0000
@@ -105,6 +105,11 @@
 <dd>
 number of the keyword set (integer)
 </dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+string giving the keywords (string) or None
+</dd>
 </dl><a NAME="LexerPerl.initProperties" ID="LexerPerl.initProperties"></a>
 <h4>LexerPerl.initProperties</h4>
 <b>initProperties</b>(<i></i>)

--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerPostScript.html	Thu Apr 01 09:38:39 2010 +0000
+++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerPostScript.html	Fri Apr 02 13:57:06 2010 +0000
@@ -92,6 +92,11 @@
 <dd>
 number of the keyword set (integer)
 </dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+string giving the keywords (string) or None
+</dd>
 </dl><a NAME="LexerPostScript.initProperties" ID="LexerPostScript.initProperties"></a>
 <h4>LexerPostScript.initProperties</h4>
 <b>initProperties</b>(<i></i>)

--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerProperties.html	Thu Apr 01 09:38:39 2010 +0000
+++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerProperties.html	Fri Apr 02 13:57:06 2010 +0000
@@ -92,6 +92,11 @@
 <dd>
 number of the keyword set (integer)
 </dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+string giving the keywords (string) or None
+</dd>
 </dl><a NAME="LexerProperties.initProperties" ID="LexerProperties.initProperties"></a>
 <h4>LexerProperties.initProperties</h4>
 <b>initProperties</b>(<i></i>)

--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerPygments.html	Thu Apr 01 09:38:39 2010 +0000
+++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerPygments.html	Fri Apr 02 13:57:06 2010 +0000
@@ -71,6 +71,9 @@
 <td><a href="#LexerPygments.defaultFont">defaultFont</a></td>
 <td>Public method to get the default font for a style.</td>
 </tr><tr>
+<td><a href="#LexerPygments.defaultKeywords">defaultKeywords</a></td>
+<td>Public method to get the default keywords.</td>
+</tr><tr>
 <td><a href="#LexerPygments.defaultPaper">defaultPaper</a></td>
 <td>Public method to get the default background color for a style.</td>
 </tr><tr>
@@ -164,6 +167,21 @@
 <dd>
 font (QFont)
 </dd>
+</dl><a NAME="LexerPygments.defaultKeywords" ID="LexerPygments.defaultKeywords"></a>
+<h4>LexerPygments.defaultKeywords</h4>
+<b>defaultKeywords</b>(<i>kwSet</i>)
+<p>
+        Public method to get the default keywords.
+</p><dl>
+<dt><i>kwSet</i></dt>
+<dd>
+number of the keyword set (integer)
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+string giving the keywords (string) or None
+</dd>
 </dl><a NAME="LexerPygments.defaultPaper" ID="LexerPygments.defaultPaper"></a>
 <h4>LexerPygments.defaultPaper</h4>
 <b>defaultPaper</b>(<i>style</i>)

--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerPython.html	Thu Apr 01 09:38:39 2010 +0000
+++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerPython.html	Fri Apr 02 13:57:06 2010 +0000
@@ -108,6 +108,11 @@
 <dd>
 number of the keyword set (integer)
 </dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+string giving the keywords (string) or None
+</dd>
 </dl><a NAME="LexerPython.getIndentationDifference" ID="LexerPython.getIndentationDifference"></a>
 <h4>LexerPython.getIndentationDifference</h4>
 <b>getIndentationDifference</b>(<i>line, editor</i>)

--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerRuby.html	Thu Apr 01 09:38:39 2010 +0000
+++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerRuby.html	Fri Apr 02 13:57:06 2010 +0000
@@ -102,6 +102,11 @@
 <dd>
 number of the keyword set (integer)
 </dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+string giving the keywords (string) or None
+</dd>
 </dl><a NAME="LexerRuby.isCommentStyle" ID="LexerRuby.isCommentStyle"></a>
 <h4>LexerRuby.isCommentStyle</h4>
 <b>isCommentStyle</b>(<i>style</i>)

--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerSQL.html	Thu Apr 01 09:38:39 2010 +0000
+++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerSQL.html	Fri Apr 02 13:57:06 2010 +0000
@@ -92,6 +92,11 @@
 <dd>
 number of the keyword set (integer)
 </dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+string giving the keywords (string) or None
+</dd>
 </dl><a NAME="LexerSQL.initProperties" ID="LexerSQL.initProperties"></a>
 <h4>LexerSQL.initProperties</h4>
 <b>initProperties</b>(<i></i>)

--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerTCL.html	Thu Apr 01 09:38:39 2010 +0000
+++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerTCL.html	Fri Apr 02 13:57:06 2010 +0000
@@ -92,6 +92,11 @@
 <dd>
 number of the keyword set (integer)
 </dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+string giving the keywords (string) or None
+</dd>
 </dl><a NAME="LexerTCL.initProperties" ID="LexerTCL.initProperties"></a>
 <h4>LexerTCL.initProperties</h4>
 <b>initProperties</b>(<i></i>)

--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerTeX.html	Thu Apr 01 09:38:39 2010 +0000
+++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerTeX.html	Fri Apr 02 13:57:06 2010 +0000
@@ -89,6 +89,11 @@
 <dd>
 number of the keyword set (integer)
 </dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+string giving the keywords (string) or None
+</dd>
 </dl><a NAME="LexerTeX.isCommentStyle" ID="LexerTeX.isCommentStyle"></a>
 <h4>LexerTeX.isCommentStyle</h4>
 <b>isCommentStyle</b>(<i>style</i>)

--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerVHDL.html	Thu Apr 01 09:38:39 2010 +0000
+++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerVHDL.html	Fri Apr 02 13:57:06 2010 +0000
@@ -92,6 +92,11 @@
 <dd>
 number of the keyword set (integer)
 </dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+string giving the keywords (string) or None
+</dd>
 </dl><a NAME="LexerVHDL.initProperties" ID="LexerVHDL.initProperties"></a>
 <h4>LexerVHDL.initProperties</h4>
 <b>initProperties</b>(<i></i>)

--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerXML.html	Thu Apr 01 09:38:39 2010 +0000
+++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerXML.html	Fri Apr 02 13:57:06 2010 +0000
@@ -92,6 +92,11 @@
 <dd>
 number of the keyword set (integer)
 </dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+string giving the keywords (string) or None
+</dd>
 </dl><a NAME="LexerXML.initProperties" ID="LexerXML.initProperties"></a>
 <h4>LexerXML.initProperties</h4>
 <b>initProperties</b>(<i></i>)

--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerYAML.html	Thu Apr 01 09:38:39 2010 +0000
+++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerYAML.html	Fri Apr 02 13:57:06 2010 +0000
@@ -92,6 +92,11 @@
 <dd>
 number of the keyword set (integer)
 </dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+string giving the keywords (string) or None
+</dd>
 </dl><a NAME="LexerYAML.initProperties" ID="LexerYAML.initProperties"></a>
 <h4>LexerYAML.initProperties</h4>
 <b>initProperties</b>(<i></i>)

--- a/QScintilla/Lexers/Lexer.py	Thu Apr 01 09:38:39 2010 +0000
+++ b/QScintilla/Lexers/Lexer.py	Fri Apr 02 13:57:06 2010 +0000
@@ -205,7 +205,8 @@
         """
         Public method to get the keywords.
         
-        @param kwSet number of the keyword set (integer) 
+        @param kwSet number of the keyword set (integer)
+        @return string giving the keywords (string) or None
         """
         keywords_ = Preferences.getEditorKeywords(self.language())
         if keywords_:

--- a/QScintilla/Lexers/LexerBash.py	Thu Apr 01 09:38:39 2010 +0000
+++ b/QScintilla/Lexers/LexerBash.py	Fri Apr 02 13:57:06 2010 +0000
@@ -57,5 +57,6 @@
         Public method to get the default keywords.
         
         @param kwSet number of the keyword set (integer) 
+        @return string giving the keywords (string) or None
         """
         return QsciLexerBash.keywords(self, kwSet)

--- a/QScintilla/Lexers/LexerBatch.py	Thu Apr 01 09:38:39 2010 +0000
+++ b/QScintilla/Lexers/LexerBatch.py	Fri Apr 02 13:57:06 2010 +0000
@@ -47,5 +47,6 @@
         Public method to get the default keywords.
         
         @param kwSet number of the keyword set (integer) 
+        @return string giving the keywords (string) or None
         """
         return QsciLexerBatch.keywords(self, kwSet)

--- a/QScintilla/Lexers/LexerCMake.py	Thu Apr 01 09:38:39 2010 +0000
+++ b/QScintilla/Lexers/LexerCMake.py	Fri Apr 02 13:57:06 2010 +0000
@@ -54,5 +54,6 @@
         Public method to get the default keywords.
         
         @param kwSet number of the keyword set (integer) 
+        @return string giving the keywords (string) or None
         """
         return QsciLexerCMake.keywords(self, kwSet)

--- a/QScintilla/Lexers/LexerCPP.py	Thu Apr 01 09:38:39 2010 +0000
+++ b/QScintilla/Lexers/LexerCPP.py	Fri Apr 02 13:57:06 2010 +0000
@@ -90,5 +90,6 @@
         Public method to get the default keywords.
         
         @param kwSet number of the keyword set (integer) 
+        @return string giving the keywords (string) or None
         """
         return QsciLexerCPP.keywords(self, kwSet)

--- a/QScintilla/Lexers/LexerCSS.py	Thu Apr 01 09:38:39 2010 +0000
+++ b/QScintilla/Lexers/LexerCSS.py	Fri Apr 02 13:57:06 2010 +0000
@@ -60,5 +60,6 @@
         Public method to get the default keywords.
         
         @param kwSet number of the keyword set (integer) 
+        @return string giving the keywords (string) or None
         """
         return QsciLexerCSS.keywords(self, kwSet)

--- a/QScintilla/Lexers/LexerCSharp.py	Thu Apr 01 09:38:39 2010 +0000
+++ b/QScintilla/Lexers/LexerCSharp.py	Fri Apr 02 13:57:06 2010 +0000
@@ -78,5 +78,6 @@
         Public method to get the default keywords.
         
         @param kwSet number of the keyword set (integer) 
+        @return string giving the keywords (string) or None
         """
         return QsciLexerCSharp.keywords(self, kwSet)

--- a/QScintilla/Lexers/LexerD.py	Thu Apr 01 09:38:39 2010 +0000
+++ b/QScintilla/Lexers/LexerD.py	Fri Apr 02 13:57:06 2010 +0000
@@ -84,5 +84,6 @@
         Public method to get the default keywords.
         
         @param kwSet number of the keyword set (integer) 
+        @return string giving the keywords (string) or None
         """
         return QsciLexerD.keywords(self, kwSet)

--- a/QScintilla/Lexers/LexerDiff.py	Thu Apr 01 09:38:39 2010 +0000
+++ b/QScintilla/Lexers/LexerDiff.py	Fri Apr 02 13:57:06 2010 +0000
@@ -45,5 +45,6 @@
         Public method to get the default keywords.
         
         @param kwSet number of the keyword set (integer) 
+        @return string giving the keywords (string) or None
         """
         return QsciLexerDiff.keywords(self, kwSet)

--- a/QScintilla/Lexers/LexerFortran.py	Thu Apr 01 09:38:39 2010 +0000
+++ b/QScintilla/Lexers/LexerFortran.py	Fri Apr 02 13:57:06 2010 +0000
@@ -64,5 +64,6 @@
         Public method to get the default keywords.
         
         @param kwSet number of the keyword set (integer) 
+        @return string giving the keywords (string) or None
         """
         return QsciLexerFortran.keywords(self, kwSet)

--- a/QScintilla/Lexers/LexerFortran77.py	Thu Apr 01 09:38:39 2010 +0000
+++ b/QScintilla/Lexers/LexerFortran77.py	Fri Apr 02 13:57:06 2010 +0000
@@ -64,5 +64,6 @@
         Public method to get the default keywords.
         
         @param kwSet number of the keyword set (integer) 
+        @return string giving the keywords (string) or None
         """
         return QsciLexerFortran77.keywords(self, kwSet)

--- a/QScintilla/Lexers/LexerHTML.py	Thu Apr 01 09:38:39 2010 +0000
+++ b/QScintilla/Lexers/LexerHTML.py	Fri Apr 02 13:57:06 2010 +0000
@@ -102,5 +102,6 @@
         Public method to get the default keywords.
         
         @param kwSet number of the keyword set (integer) 
+        @return string giving the keywords (string) or None
         """
         return QsciLexerHTML.keywords(self, kwSet)

--- a/QScintilla/Lexers/LexerIDL.py	Thu Apr 01 09:38:39 2010 +0000
+++ b/QScintilla/Lexers/LexerIDL.py	Fri Apr 02 13:57:06 2010 +0000
@@ -78,5 +78,6 @@
         Public method to get the default keywords.
         
         @param kwSet number of the keyword set (integer) 
+        @return string giving the keywords (string) or None
         """
         return QsciLexerIDL.keywords(self, kwSet)

--- a/QScintilla/Lexers/LexerJava.py	Thu Apr 01 09:38:39 2010 +0000
+++ b/QScintilla/Lexers/LexerJava.py	Fri Apr 02 13:57:06 2010 +0000
@@ -78,5 +78,6 @@
         Public method to get the default keywords.
         
         @param kwSet number of the keyword set (integer) 
+        @return string giving the keywords (string) or None
         """
         return QsciLexerJava.keywords(self, kwSet)

--- a/QScintilla/Lexers/LexerJavaScript.py	Thu Apr 01 09:38:39 2010 +0000
+++ b/QScintilla/Lexers/LexerJavaScript.py	Fri Apr 02 13:57:06 2010 +0000
@@ -78,5 +78,6 @@
         Public method to get the default keywords.
         
         @param kwSet number of the keyword set (integer) 
+        @return string giving the keywords (string) or None
         """
         return QsciLexerJavaScript.keywords(self, kwSet)

--- a/QScintilla/Lexers/LexerLua.py	Thu Apr 01 09:38:39 2010 +0000
+++ b/QScintilla/Lexers/LexerLua.py	Fri Apr 02 13:57:06 2010 +0000
@@ -65,5 +65,6 @@
         Public method to get the default keywords.
         
         @param kwSet number of the keyword set (integer) 
+        @return string giving the keywords (string) or None
         """
         return QsciLexerLua.keywords(self, kwSet)

--- a/QScintilla/Lexers/LexerMakefile.py	Thu Apr 01 09:38:39 2010 +0000
+++ b/QScintilla/Lexers/LexerMakefile.py	Fri Apr 02 13:57:06 2010 +0000
@@ -48,5 +48,6 @@
         Public method to get the default keywords.
         
         @param kwSet number of the keyword set (integer) 
+        @return string giving the keywords (string) or None
         """
         return QsciLexerMakefile.keywords(self, kwSet)

--- a/QScintilla/Lexers/LexerPOV.py	Thu Apr 01 09:38:39 2010 +0000
+++ b/QScintilla/Lexers/LexerPOV.py	Fri Apr 02 13:57:06 2010 +0000
@@ -67,5 +67,6 @@
         Public method to get the default keywords.
         
         @param kwSet number of the keyword set (integer) 
+        @return string giving the keywords (string) or None
         """
         return QsciLexerPOV.keywords(self, kwSet)

--- a/QScintilla/Lexers/LexerPascal.py	Thu Apr 01 09:38:39 2010 +0000
+++ b/QScintilla/Lexers/LexerPascal.py	Fri Apr 02 13:57:06 2010 +0000
@@ -79,5 +79,6 @@
         Public method to get the default keywords.
         
         @param kwSet number of the keyword set (integer) 
+        @return string giving the keywords (string) or None
         """
         return QsciLexerPascal.keywords(self, kwSet)

--- a/QScintilla/Lexers/LexerPerl.py	Thu Apr 01 09:38:39 2010 +0000
+++ b/QScintilla/Lexers/LexerPerl.py	Fri Apr 02 13:57:06 2010 +0000
@@ -76,5 +76,6 @@
         Public method to get the default keywords.
         
         @param kwSet number of the keyword set (integer) 
+        @return string giving the keywords (string) or None
         """
         return QsciLexerPerl.keywords(self, kwSet)

--- a/QScintilla/Lexers/LexerPostScript.py	Thu Apr 01 09:38:39 2010 +0000
+++ b/QScintilla/Lexers/LexerPostScript.py	Fri Apr 02 13:57:06 2010 +0000
@@ -57,5 +57,6 @@
         Public method to get the default keywords.
         
         @param kwSet number of the keyword set (integer) 
+        @return string giving the keywords (string) or None
         """
         return QsciLexerPostScript.keywords(self, kwSet)

--- a/QScintilla/Lexers/LexerProperties.py	Thu Apr 01 09:38:39 2010 +0000
+++ b/QScintilla/Lexers/LexerProperties.py	Fri Apr 02 13:57:06 2010 +0000
@@ -54,5 +54,6 @@
         Public method to get the default keywords.
         
         @param kwSet number of the keyword set (integer) 
+        @return string giving the keywords (string) or None
         """
         return QsciLexerProperties.keywords(self, kwSet)

--- a/QScintilla/Lexers/LexerPygments.py	Thu Apr 01 09:38:39 2010 +0000
+++ b/QScintilla/Lexers/LexerPygments.py	Fri Apr 02 13:57:06 2010 +0000
@@ -401,3 +401,12 @@
         return style in [PYGMENTS_STRING, PYGMENTS_DOCSTRING, PYGMENTS_OTHER, 
                          PYGMENTS_HEADING, PYGMENTS_SUBHEADING, PYGMENTS_EMPHASIZE, 
                          PYGMENTS_STRONG]
+    
+    def defaultKeywords(self, kwSet):
+        """
+        Public method to get the default keywords.
+        
+        @param kwSet number of the keyword set (integer) 
+        @return string giving the keywords (string) or None
+        """
+        return None

--- a/QScintilla/Lexers/LexerPython.py	Thu Apr 01 09:38:39 2010 +0000
+++ b/QScintilla/Lexers/LexerPython.py	Fri Apr 02 13:57:06 2010 +0000
@@ -121,6 +121,7 @@
         """
         Public method to get the default keywords.
         
-        @param kwSet number of the keyword set (integer) 
+        @param kwSet number of the keyword set (integer)
+        @return string giving the keywords (string) or None
         """
         return QsciLexerPython.keywords(self, kwSet)

--- a/QScintilla/Lexers/LexerRuby.py	Thu Apr 01 09:38:39 2010 +0000
+++ b/QScintilla/Lexers/LexerRuby.py	Fri Apr 02 13:57:06 2010 +0000
@@ -62,5 +62,6 @@
         Public method to get the default keywords.
         
         @param kwSet number of the keyword set (integer) 
+        @return string giving the keywords (string) or None
         """
         return QsciLexerRuby.keywords(self, kwSet)

--- a/QScintilla/Lexers/LexerSQL.py	Thu Apr 01 09:38:39 2010 +0000
+++ b/QScintilla/Lexers/LexerSQL.py	Fri Apr 02 13:57:06 2010 +0000
@@ -58,5 +58,6 @@
         Public method to get the default keywords.
         
         @param kwSet number of the keyword set (integer) 
+        @return string giving the keywords (string) or None
         """
         return QsciLexerSQL.keywords(self, kwSet)

--- a/QScintilla/Lexers/LexerTCL.py	Thu Apr 01 09:38:39 2010 +0000
+++ b/QScintilla/Lexers/LexerTCL.py	Fri Apr 02 13:57:06 2010 +0000
@@ -58,5 +58,6 @@
         Public method to get the default keywords.
         
         @param kwSet number of the keyword set (integer) 
+        @return string giving the keywords (string) or None
         """
         return QsciLexerTCL.keywords(self, kwSet)

--- a/QScintilla/Lexers/LexerTeX.py	Thu Apr 01 09:38:39 2010 +0000
+++ b/QScintilla/Lexers/LexerTeX.py	Fri Apr 02 13:57:06 2010 +0000
@@ -47,5 +47,6 @@
         Public method to get the default keywords.
         
         @param kwSet number of the keyword set (integer) 
+        @return string giving the keywords (string) or None
         """
         return QsciLexerTeX.keywords(self, kwSet)

--- a/QScintilla/Lexers/LexerVHDL.py	Thu Apr 01 09:38:39 2010 +0000
+++ b/QScintilla/Lexers/LexerVHDL.py	Fri Apr 02 13:57:06 2010 +0000
@@ -61,5 +61,6 @@
         Public method to get the default keywords.
         
         @param kwSet number of the keyword set (integer) 
+        @return string giving the keywords (string) or None
         """
         return QsciLexerVHDL.keywords(self, kwSet)

--- a/QScintilla/Lexers/LexerXML.py	Thu Apr 01 09:38:39 2010 +0000
+++ b/QScintilla/Lexers/LexerXML.py	Fri Apr 02 13:57:06 2010 +0000
@@ -103,5 +103,6 @@
         Public method to get the default keywords.
         
         @param kwSet number of the keyword set (integer) 
+        @return string giving the keywords (string) or None
         """
         return QsciLexerXML.keywords(self, kwSet)

--- a/QScintilla/Lexers/LexerYAML.py	Thu Apr 01 09:38:39 2010 +0000
+++ b/QScintilla/Lexers/LexerYAML.py	Fri Apr 02 13:57:06 2010 +0000
@@ -54,5 +54,6 @@
         Public method to get the default keywords.
         
         @param kwSet number of the keyword set (integer) 
+        @return string giving the keywords (string) or None
         """
         return QsciLexerYAML.keywords(self, kwSet)