Don't call plugin if nil

diff --git a/cmd/micro/micro.go b/cmd/micro/micro.go
index fb5ce2207c579ed6204ba9ac3d2e4976176fbf6f..3e0284fcd6fe92070b34fc6e11ecf7e241b5d278 100644 (file)
--- a/cmd/micro/micro.go
+++ b/cmd/micro/micro.go
@@ -269,6 +269,8 @@ func main() {
                action.InfoBar.Display()
                screen.Screen.Show()
 
+               event = nil
+
                // Check for new events
                select {
                case f := <-shell.Jobs:

diff --git a/internal/config/plugin.go b/internal/config/plugin.go
index 8cd933ac15e3bc34fd19325b519134693ab14fcc..e46e3c6e44b5140956fef58e0dcfc67ca25fb60d 100644 (file)
--- a/internal/config/plugin.go
+++ b/internal/config/plugin.go
@@ -2,6 +2,7 @@ package config
 
 import (
        "errors"
+       "log"
 
        lua "github.com/yuin/gopher-lua"
        ulua "github.com/zyedidia/micro/internal/lua"
@@ -103,6 +104,10 @@ func (p *Plugin) Load() error {
 
 func (p *Plugin) Call(fn string, args ...lua.LValue) (lua.LValue, error) {
        plug := ulua.L.GetGlobal(p.Name)
+       if plug == lua.LNil {
+               log.Println("Plugin does not exist:", p.Name, "at", p.DirName, ":", p)
+               return nil, nil
+       }
        luafn := ulua.L.GetField(plug, fn)
        if luafn == lua.LNil {
                return nil, ErrNoSuchFunction