Always use custom syntax files over default

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

diff --git a/cmd/micro/buffer.go b/cmd/micro/buffer.go
index 6471baf0ef009b70c4659bf0a3a2ea836e0cdd54..b8071839c909f913be227814b7155ecd6e89dbc9 100644 (file)
--- a/cmd/micro/buffer.go
+++ b/cmd/micro/buffer.go
@@ -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
@@ -316,7 +316,7 @@ func (b *Buffer) MergeCursors() {
                if c1 != nil {
                        for j := 0; j < len(b.cursors); j++ {
                                c2 := b.cursors[j]
-                               if i != j && c1.Loc == c2.Loc {
+                               if c2 != nil && i != j && c1.Loc == c2.Loc {
                                        b.cursors[j] = nil
                                }
                        }
@@ -403,17 +403,9 @@ func (b *Buffer) SaveAsWithSudo(filename string) error {
        b.UpdateRules()
        b.Path = filename
 
-       // The user may have already used sudo in which case we won't need the password
-       // It's a bit nicer for them if they don't have to enter the password every time
-       _, err := RunShellCommand("sudo -v")
-       needPassword := err != nil
-
-       // If we need the password, we have to close the screen and ask using the shell
-       if needPassword {
-               // Shut down the screen because we're going to interact directly with the shell
-               screen.Fini()
-               screen = nil
-       }
+       // Shut down the screen because we're going to interact directly with the shell
+       screen.Fini()
+       screen = nil
 
        // Set up everything for the command
        cmd := exec.Command("sudo", "tee", filename)
@@ -431,13 +423,10 @@ func (b *Buffer) SaveAsWithSudo(filename string) error {
 
        // Start the command
        cmd.Start()
-       err = cmd.Wait()
+       err := cmd.Wait()
 
-       // If we needed the password, we closed the screen, so we have to initialize it again
-       if needPassword {
-               // Start the screen back up
-               InitScreen()
-       }
+       // Start the screen back up
+       InitScreen()
        if err == nil {
                b.IsModified = false
                b.ModTime, _ = GetModTime(filename)