Fix: mouse clicking with softwrap

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

diff --git a/cmd/micro/command.go b/cmd/micro/command.go
index a5208eeb2259acb9a3a665497b7d9ec682cd9fca..0c582e2025ce9d75f4867695dae651c741b3caaf 100644 (file)
--- a/cmd/micro/command.go
+++ b/cmd/micro/command.go
@@ -4,7 +4,6 @@ import (
        "bytes"
        "fmt"
        "io"
-       "io/ioutil"
        "os"
        "os/exec"
        "os/signal"
@@ -266,17 +265,18 @@ func Help(args []string) {
 // If no file is given, it opens an empty buffer in a new split
 func VSplit(args []string) {
        if len(args) == 0 {
-               CurView().VSplit(NewBuffer([]byte{}, ""))
+               CurView().VSplit(NewBuffer(strings.NewReader(""), ""))
        } else {
                filename := args[0]
                home, _ := homedir.Dir()
                filename = strings.Replace(filename, "~", home, 1)
-               file, err := ioutil.ReadFile(filename)
+               file, err := os.Open(filename)
+               defer file.Close()
 
                var buf *Buffer
                if err != nil {
                        // File does not exist -- create an empty buffer with that name
-                       buf = NewBuffer([]byte{}, filename)
+                       buf = NewBuffer(strings.NewReader(""), filename)
                } else {
                        buf = NewBuffer(file, filename)
                }
@@ -288,17 +288,18 @@ func VSplit(args []string) {
 // If no file is given, it opens an empty buffer in a new split
 func HSplit(args []string) {
        if len(args) == 0 {
-               CurView().HSplit(NewBuffer([]byte{}, ""))
+               CurView().HSplit(NewBuffer(strings.NewReader(""), ""))
        } else {
                filename := args[0]
                home, _ := homedir.Dir()
                filename = strings.Replace(filename, "~", home, 1)
-               file, err := ioutil.ReadFile(filename)
+               file, err := os.Open(filename)
+               defer file.Close()
 
                var buf *Buffer
                if err != nil {
                        // File does not exist -- create an empty buffer with that name
-                       buf = NewBuffer([]byte{}, filename)
+                       buf = NewBuffer(strings.NewReader(""), filename)
                } else {
                        buf = NewBuffer(file, filename)
                }
@@ -326,12 +327,13 @@ func NewTab(args []string) {
                filename := args[0]
                home, _ := homedir.Dir()
                filename = strings.Replace(filename, "~", home, 1)
-               file, _ := ioutil.ReadFile(filename)
+               file, _ := os.Open(filename)
+               defer file.Close()
 
                tab := NewTabFromView(NewView(NewBuffer(file, filename)))
                tab.SetNum(len(tabs))
                tabs = append(tabs, tab)
-               curTab++
+               curTab = len(tabs) - 1
                if len(tabs) == 2 {
                        for _, t := range tabs {
                                for _, v := range t.views {