OutdentSelection works on all cases (whatever tabsize or tabstospace values)

[micro.git] / cmd / micro / highlighter.go

diff --git a/cmd/micro/highlighter.go b/cmd/micro/highlighter.go
index ba88a705b0481a2c2bffd6131997e96238da280c..53a46555a7d96ff50ade2c5aab51e6775dc947fa 100644 (file)
--- 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)
 }