Rename to tabstospaces for consistency

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

diff --git a/cmd/micro/micro.go b/cmd/micro/micro.go
index d92412156e7a193ba1b05c868c6f4f17074da139..718d220d6b7937b09262217ea393b463b7acaa68 100644 (file)
--- a/cmd/micro/micro.go
+++ b/cmd/micro/micro.go
@@ -5,6 +5,7 @@ import (
        "fmt"
        "io/ioutil"
        "os"
+       "runtime"
 
        "github.com/go-errors/errors"
        "github.com/layeh/gopher-luar"
@@ -183,10 +184,6 @@ func main() {
        L = lua.NewState()
        defer L.Close()
 
-       if err := L.DoFile("plugin.lua"); err != nil {
-               panic(err)
-       }
-
        encoding.Register()
        tcell.SetEncodingFallback(tcell.EncodingFallbackASCII)
 
@@ -219,9 +216,13 @@ func main() {
        messenger = new(Messenger)
        view := NewView(buf)
 
+       L.SetGlobal("OS", luar.New(L, runtime.GOOS))
        L.SetGlobal("view", luar.New(L, view))
-       L.SetGlobal("settings", luar.New(L, &settings))
        L.SetGlobal("messenger", luar.New(L, messenger))
+       L.SetGlobal("GetOption", luar.New(L, GetOption))
+       L.SetGlobal("AddOption", luar.New(L, AddOption))
+
+       LoadPlugins()
 
        for {
                // Display everything
@@ -261,7 +262,7 @@ func main() {
                                case tcell.KeyCtrlG:
                                        if !helpOpen {
                                                helpBuffer := NewBuffer(helpTxt, "help.md")
-                                               helpBuffer.name = "Help"
+                                               helpBuffer.Name = "Help"
                                                helpOpen = true
                                                view.OpenBuffer(helpBuffer)
                                        } else {