github/zyedidia.micro
2
0
Fork 0
mirror of https://github.com/zyedidia/micro.git synced 2026-03-18 14:57:18 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into view-refactor

Browse Source
This commit is contained in:
Zachary Yedidia
2017-03-26 20:40:03 -04:00
parent 4cda7e2d92 53a19afe52
commit 12d74b99e8
47 changed files with 1668 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
cmd/micro/command.go
View File

@@ -326,6 +326,13 @@ func VSplit(args []string) {
home, _ := homedir.Dir()
filename = strings.Replace(filename, "~", home, 1)
file, err := os.Open(filename)
fileInfo, _ := os.Stat(filename)
if err == nil && fileInfo.IsDir() {
messenger.Error(filename, " is a directory")
return
}
defer file.Close()
var buf *Buffer
@@ -349,6 +356,13 @@ func HSplit(args []string) {
home, _ := homedir.Dir()
filename = strings.Replace(filename, "~", home, 1)
file, err := os.Open(filename)
fileInfo, _ := os.Stat(filename)
if err == nil && fileInfo.IsDir() {
messenger.Error(filename, " is a directory")
return
}
defer file.Close()
var buf *Buffer
@@ -382,10 +396,24 @@ func NewTab(args []string) {
filename := args[0]
home, _ := homedir.Dir()
filename = strings.Replace(filename, "~", home, 1)
file, _ := os.Open(filename)
file, err := os.Open(filename)
fileInfo, _ := os.Stat(filename)
if err == nil && fileInfo.IsDir() {
messenger.Error(filename, " is a directory")
return
}
defer file.Close()
tab := NewTabFromView(NewView(NewBuffer(file, filename)))
var buf *Buffer
if err != nil {
buf = NewBuffer(strings.NewReader(""), filename)
} else {
buf = NewBuffer(file, filename)
}
tab := NewTabFromView(NewView(buf))
tab.SetNum(len(tabs))
tabs = append(tabs, tab)
curTab = len(tabs) - 1