X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=cmd%2Fmicro%2Fhighlighter.go;h=53a46555a7d96ff50ade2c5aab51e6775dc947fa;hb=ed9bc660607996e068a8d37e0194ce32ed534497;hp=ba88a705b0481a2c2bffd6131997e96238da280c;hpb=2e6cbcb362a4eba98a0019538d8fd6d924745f16;p=micro.git

diff --git a/cmd/micro/highlighter.go b/cmd/micro/highlighter.go
index ba88a705..53a46555 100644
--- a/cmd/micro/highlighter.go
+++ b/cmd/micro/highlighter.go
@@ -2,7 +2,7 @@ package main
 
 import "github.com/zyedidia/micro/cmd/micro/highlight"
 
-var syntaxDefs []*highlight.Def
+var syntaxFiles []*highlight.File
 
 func LoadSyntaxFiles() {
 	InitColorscheme()
@@ -14,17 +14,15 @@ func LoadSyntaxFiles() {
 			LoadSyntaxFile(data, f.Name())
 		}
 	}
-
-	highlight.ResolveIncludes(syntaxDefs)
 }
 
 func LoadSyntaxFile(text []byte, filename string) {
-	def, err := highlight.ParseDef(text)
+	f, err := highlight.ParseFile(text)
 
 	if err != nil {
 		TermMessage("Syntax file error: " + filename + ": " + err.Error())
 		return
 	}
 
-	syntaxDefs = append(syntaxDefs, def)
+	syntaxFiles = append(syntaxFiles, f)
 }