--- a/lisp/nsis-mode.el	Sat Jan 30 21:24:29 2010 +0200
+++ b/lisp/nsis-mode.el	Sat Jan 30 23:10:04 2010 +0200
@@ -20,12 +20,12 @@
 (define-generic-mode 'nsis-mode
   (list ?\; ?\# '("/*" . "*/"))
   '(
-    "Section" "SectionEnd" "Function" "FunctionEnd" "File"
+    "Section" "SectionEnd" "SectionIn" "SectionGroup" "SectionGroupEnd" "Function" "FunctionEnd" "File"
     "SectionSetFlags" "SectionGetFlags" "SectionSetText" "SectionGetText" "SectionSetInstTypes" "SectionGetInstTypes" "SectionSetSize" "SectionGetSize" "SetCurInstType" "GetCurInstType" "InstTypeSetText" "InstTypeGetText"
     "Name" "ShowInstDetails" "Caption"
     "LicenseText" "LicenseData" "LicenseForceSelection" "ComponentText" "BrandingText" "DetailsButtonText" "CompletedText" "UninstallText"
     "DirText" "DirVar" "DirVerify"
-    "Exec" "ExecWait" "ExecShell" "Goto" "Call" "Return" "Abort" "Quit" "ClearErrors" "SetErrors"
+    "Exec" "ExecWait" "ExecShell" "Goto" "goto" "Call" "Return" "Abort" "Quit" "ClearErrors" "SetErrors"
     "Reboot" "SetRebootFlag"
     "IfSilent" "IfAbort" "IfRebootFlag" "IfErrors" "IfFileExists"
     "GetCurrentAddress" "GetFunctionAddress" "GetLabelAddress"
@@ -33,29 +33,31 @@
     "Delete" "CopyFiles" "CreateDirectory" "RMDir" "OutFile" "ReserveFile" "CreateShortCut"
     "CallInstDLL" "GetDLLVersion" "GetDLLVersionLocal" "RegDLL" "UnRegDLL"
     "GetFileTime" "GetFileTimeLocal" "GetFullPathName" "GetTempFileName" "SearchPath" "SetFileAttributes"
-    "ReadRegStr" "WriteRegStr" "DeleteRegKey" "DeleteRegValue" "EnumRegKey" "EnumRegValue" "WriteRegDWORD" "ReadRegDWORD" "WriteRegBin" "WriteRegDWORD" "WriteRegExpandStr"
+    "ReadRegStr" "WriteRegStr" "DeleteRegKey" "DeleteRegValue" "EnumRegKey" "EnumRegValue" "WriteRegDWORD" "ReadRegDWORD" "WriteRegDword" "WriteRegBin" "WriteRegDWORD" "WriteRegExpandStr"
     "ExpandEnvStrings" "ReadEnvStr"
     "DeleteINISec" "DeleteINIStr" "FlushINI" "ReadINIStr" "WriteINIStr"
     "Var" "Pop" "Push" "Exch"
     "StrLen" "StrCpy" "StrCmp" "StrCmpS" "IntCmp" "IntCmpU" "IntFmt" "IntOp"
     "FileClose" "FileOpen" "FileRead" "FileReadByte" "FileSeek" "FileWrite" "FileWriteByte" "FindClose" "FindFirst" "FindNext"
-    "InitPluginsDir" "addplugindir" "InstallDir" "InstallDirRegKey" "Nop" "Sleep"
+    "InitPluginsDir" "addplugindir" "InstallDir" "InstallDirRegKey" "InstType" "Nop" "Sleep"
     "RequestExecutionLevel" "CRCCheck" "XPStyle"
     "ReadIniStr" "WriteIniStr"
     "LogSet" "LogText"
     "Icon" "UninstallIcon"
     "SendMessage" "MessageBox" "GetDlgItem"
-    "FindWindow" "EnableWindow" "LockWindow" "ShowWindow" "HideWindow" "IsWindow"
+    "FindWindow" "EnableWindow" "LockWindow" "ShowWindow" "HideWindow" "IsWindow" "AutoCloseWindow"
     "SetAutoClose" "CreateFont" "SetCtlColors" "SetBrandingImage" "SetDetailsView" "SetDetailsPrint" "SetSilent" "BringToFront" "DetailPrint"
     "LoadLanguageFile" "LangString" "LicenseLangString"
     "SubCaption" "UninstallSubCaption"
     "SetPluginUnload" "DetailPrint" "SetOutPath" "WriteUninstaller"
     "GetErrorLevel" "SetErrorLevel" "GetInstDirError" "SetRegView" "SetShellVarContext"
+    "SetDateSave" "SetDatablockOptimize" "BGGradient" "InstallColors" "CheckBitmap" "SilentInstall" "SetOverwrite"
+    "SetCompress"
     )
   '(
-    ("!\\(insertmacro\\|define\\|ifdef\\|ifndef\\|else\\|endif\\|echo\\|verbose\\|include\\|macroend\\|macro\\|undef\\|warning\\|error\\)" (1 'font-lock-builtin-face))
+    ("!\\(insertmacro\\|define\\|ifdef\\|ifndef\\|else\\|endif\\|echo\\|verbose\\|include\\|macroend\\|macro\\|undef\\|packhdr\\|warning\\|error\\)" (1 'font-lock-builtin-face))
     ("$[({]?\\([A-Za-z0-9_]+\\)[)}]?" (1 'font-lock-variable-name-face))
-    ("\\([[:alpha:]][[:alnum:]_.]*:[[:blank:]]*$\\)" (1 'font-lock-function-name-face))
+    ("[[:blank:]]*\\([[:alpha:]][[:alnum:]_.]*:\\)" (1 'font-lock-function-name-face))
     )
   (list "\\.\\(nsi\\|nsh\\)$")
   nil