diff -r 3f3741021d26 -r 45fe12e8533b Preferences/ConfigurationPages/EditorKeywordsPage.py
--- a/Preferences/ConfigurationPages/EditorKeywordsPage.py Sat Nov 19 18:07:25 2011 +0100
+++ b/Preferences/ConfigurationPages/EditorKeywordsPage.py Sun Nov 20 14:44:05 2011 +0100
@@ -13,6 +13,7 @@
from .Ui_EditorKeywordsPage import Ui_EditorKeywordsPage
import QScintilla.Lexers
+from QScintilla.Lexers.LexerContainer import LexerContainer
import Preferences
@@ -36,20 +37,20 @@
languages = sorted([''] + \
list(QScintilla.Lexers.getSupportedLanguages().keys()))
for lang in languages:
- if lang != "Guessed":
- self.languageCombo.addItem(lang)
-
- for lang in languages[1:]:
- keywords = Preferences.getEditorKeywords(lang)[:]
- if not keywords:
- keywords = [""]
+ if lang:
lex = QScintilla.Lexers.getLexer(lang)
- for kwSet in range(1, 10):
- kw = lex.keywords(kwSet)
- if kw is None:
- kw = ""
- keywords.append(kw)
- self.__keywords[lang] = keywords
+ if isinstance(lex, LexerContainer):
+ continue
+ keywords = Preferences.getEditorKeywords(lang)[:]
+ if not keywords:
+ keywords = [""]
+ for kwSet in range(1, 10):
+ kw = lex.keywords(kwSet)
+ if kw is None:
+ kw = ""
+ keywords.append(kw)
+ self.__keywords[lang] = keywords
+ self.languageCombo.addItem(lang)
self.currentLanguage = ''
self.currentSet = 1
