Merge branch 'idleberg-gh-pages' into gh-pages

# Conflicts: # components/prism-nsis.min.js
PrismJS · May 8, 2017 · 01a59d8 · 01a59d8
2 parents 2094221 + 48bbc39
commit 01a59d8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/components/prism-nsis.js b/components/prism-nsis.js
diff --git a/components/prism-nsis.min.js b/components/prism-nsis.min.js
diff --git a/tests/languages/nsis/constant_feature.test b/tests/languages/nsis/constant_feature.test
@@ -1,17 +1,21 @@
 $(myLicenseData)
+$(^Name)
 ${LANG_ENGLISH}
 ${AtLeastWin8.1}
 ${nsArray_Copy}
 ${xml::CreateNode}
+${^EXAMPLE}
 
 ----------------------------------------------------
 
 [
     ["constant", "$(myLicenseData)"],
+    ["constant", "$(^Name)"],
     ["constant", "${LANG_ENGLISH}"],
     ["constant", "${AtLeastWin8.1}"],
     ["constant", "${nsArray_Copy}"],
-	["constant", "${xml::CreateNode}"]
+    ["constant", "${xml::CreateNode}"],
+    ["constant", "${^EXAMPLE}"]
 ]
 
 ----------------------------------------------------

diff --git a/tests/languages/nsis/keyword_feature.test b/tests/languages/nsis/keyword_feature.test
@@ -168,7 +168,6 @@ SetFileAttributes
 SetFont
 SetOutPath
 SetOverwrite
-SetPluginUnload
 SetRebootFlag
 SetRegView
 SetShellVarContext
@@ -384,7 +383,6 @@ XPStyle
 	["keyword", "SetFont"],
 	["keyword", "SetOutPath"],
 	["keyword", "SetOverwrite"],
-	["keyword", "SetPluginUnload"],
 	["keyword", "SetRebootFlag"],
 	["keyword", "SetRegView"],
 	["keyword", "SetShellVarContext"],