--- a\np2src\src\Styles.c	Tue Feb 24 17:36:21 2009
+++ b\np2src\src\Styles.c	Tue Feb 24 17:40:00 2009
@@ -692,23 +692,23 @@ KEYWORDLIST KeyWords_PAS = {
 
 
 EDITLEXER lexPAS = { SCLEX_PASCAL, L"Pascal Source Code", L"pas; dpr; dpk; dfm; inc; pp", L"", &KeyWords_PAS, {
                      { STYLE_DEFAULT, L"Default", L"", L"" },
-                     //{ 0, L"Default", L"", L"" },
-                     { SCE_C_COMMENT, L"Comment", L"fore:#008000", L"" },
-                     { SCE_C_COMMENTLINE, L"Comment Line", L"fore:#008000", L"" },
-                     { SCE_C_COMMENTDOC, L"Comment Doc", L"fore:#008000", L"" },
-                     { SCE_C_WORD, L"Keyword", L"fore:#800080; bold", L"" },
-                     { SCE_C_IDENTIFIER, L"Identifier", L"", L"" },
-                     //{ SCE_C_STRING, L"String", L"", L"" },
-                     //{ SCE_C_STRINGEOL, L"String eol", L"", L"" },
-                     { SCE_C_NUMBER, L"Number", L"fore:#FF0000", L"" },
-                     { SCE_C_CHARACTER, L"String", L"fore:#008000", L"" },
-                     { SCE_C_OPERATOR, L"Operator", L"fore:#0A246A", L"" },
-                     { SCE_C_PREPROCESSOR, L"Preprocessor", L"fore:#808080", L"" },
-                     { SCE_C_REGEX, L"Inline Asm", L"fore:#FF8000", L"" },
-                     //{ SCE_C_COMMENTDOCKEYWORD, L"Comment Doc Keyword", L"fore:#008000", L"" },
-                     //{ SCE_C_COMMENTDOCKEYWORDERROR, L"Comment Doc Keyword Error", L"fore:#008000", L"" },
+                   //{ SCE_PAS_DEFAULT,       L"Default",               L"", L"" },
+                     { SCE_PAS_IDENTIFIER,    L"Identifier",            L"", L"" },
+                     { SCE_PAS_COMMENT,       L"Comment {...}",         L"fore:#008000", L"" },
+                     { SCE_PAS_COMMENT2,      L"Comment (*...*)",       L"fore:#008000", L"" },
+                     { SCE_PAS_COMMENTLINE,   L"Comment //...",         L"fore:#008000", L"" },
+                     { SCE_PAS_PREPROCESSOR,  L"Preprocessor {$...}",   L"fore:#808080", L"" },
+                     { SCE_PAS_PREPROCESSOR2, L"Preprocessor (*$...*)", L"fore:#808080", L"" },
+                     { SCE_PAS_NUMBER,        L"Number",                L"fore:#FF0000", L"" },
+                     { SCE_PAS_HEXNUMBER,     L"Hex Number",            L"fore:#FF0000", L"" },
+                     { SCE_PAS_WORD,          L"Keyword",               L"fore:#800080; bold", L"" },
+                     { SCE_PAS_STRING,        L"String",                L"fore:#008000", L"" },
+                     { SCE_PAS_STRINGEOL,     L"String not closed",     L"fore:#008000; back:#FFFF80; eolfilled", L"" },
+                     { SCE_PAS_CHARACTER,     L"Character",             L"fore:#008000", L"" },
+                     { SCE_PAS_OPERATOR,      L"Operator",              L"fore:#0A246A", L"" },
+                     { SCE_PAS_ASM,           L"Inline Asm",            L"fore:#FF8000", L"" },
                      { -1, L"", L"", L"" } } };
 
 
 KEYWORDLIST KeyWords_ASM = {
@@ -1379,8 +1379,10 @@ void Style_SetLexer(HWND hwnd,PEDITLEXER
     SendMessage(hwnd,SCI_SETSTYLEBITS,5,0);
 
   if (pLexNew->iLexer == SCLEX_CPP)
     SendMessage(hwnd,SCI_SETPROPERTY,(WPARAM)"styling.within.preprocessor",(LPARAM)"1");
+  else if (pLexNew->iLexer == SCLEX_PASCAL)
+    SendMessage(hwnd,SCI_SETPROPERTY,(WPARAM)"lexer.pascal.smart.highlighting",(LPARAM)"1");
 
   // Add KeyWord Lists
   for (i = 0; i < 9; i++)
     SendMessage(hwnd,SCI_SETKEYWORDS,i,(LPARAM)pLexNew->pKeyWords->pszKeyWords[i]);