Always use custom syntax files over default

The custom syntax files were first in the array but micro should stop
loading files into the filetype if it already found a match.

Fixes #750
This commit is contained in:
Zachary Yedidia
2017-07-23 20:22:47 -04:00
parent 5dcc486214
commit 5c462f5600

View File

@@ -208,7 +208,7 @@ func (b *Buffer) UpdateRules() {
}
ft := b.Settings["filetype"].(string)
if ft == "Unknown" || ft == "" {
if (ft == "Unknown" || ft == "") && !rehighlight {
if highlight.MatchFiletype(ftdetect, b.Path, b.lines[0].data) {
header := new(highlight.Header)
header.FileType = file.FileType
@@ -221,7 +221,7 @@ func (b *Buffer) UpdateRules() {
rehighlight = true
}
} else {
if file.FileType == ft {
if file.FileType == ft && !rehighlight {
header := new(highlight.Header)
header.FileType = file.FileType
header.FtDetect = ftdetect