Merge branch '3266_puppet_syntax'

* 3266_puppet_syntax: Ticket 3266: Add puppet manifest syntax support - use .pp extension (was used for Pascal highlighting)
SubOptimal · Jan 12, 2015 · 4011bfe · 4011bfe
2 parents 6347de2 + 17dddbb
commit 4011bfe
Show file tree

Hide file tree

Showing 3 changed files with 522 additions and 1 deletion.
diff --git a/misc/syntax/Makefile.am b/misc/syntax/Makefile.am
@@ -58,6 +58,7 @@ SYNTAXFILES =			\
 	povray.syntax		\
 	procmail.syntax		\
 	properties.syntax	\
+	puppet.syntax		\
 	python.syntax		\
 	cython.syntax		\
 	ruby.syntax		\

diff --git a/misc/syntax/Syntax.in b/misc/syntax/Syntax.in
@@ -70,7 +70,7 @@ include makefile.syntax
 file (CMakeLists.txt|.\*.cmake)$ CMake
 include cmake.syntax
 
-file ..\*\\.(pp|PP|pas|PAS|dpr|DPR|inc|INC)$ Pascal\sProgram
+file ..\*\\.(pas|PAS|dpr|DPR|inc|INC)$ Pascal\sProgram
 include pascal.syntax
 
 file ..\*\\.(ada|adb|ads|ADA|ADB|ADS)$ Ada\sProgram
@@ -256,5 +256,8 @@ include jal.syntax
 file ..\*\\.([lL][kK][rR])$ PIC\slinker\sscript\sfile
 include lkr.syntax
 
+file .\*\\.pp$ Puppet\smanifest\sfile
+include puppet.syntax
+
 file .\* unknown
 include unknown.syntax