Fix windows errors

diff --git a/.gitmodules b/.gitmodules
index 860158156bd813a4a5731875ed1c6fb67c5342d6..5b8d9e4101a12621bf705fe6dd70e8d08a2829c3 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -55,9 +55,9 @@
 [submodule "cmd/micro/vendor/github.com/flynn/json5"]
        path = cmd/micro/vendor/github.com/flynn/json5
        url = https://github.com/flynn/json5
-[submodule "cmd/micro/vendor/github.com/james4k/terminal"]
-       path = cmd/micro/vendor/github.com/james4k/terminal
-       url = https://github.com/james4k/terminal
 [submodule "cmd/micro/vendor/github.com/kr/pty"]
        path = cmd/micro/vendor/github.com/kr/pty
        url = https://github.com/kr/pty
+[submodule "cmd/micro/vendor/github.com/zyedidia/terminal"]
+       path = cmd/micro/vendor/github.com/zyedidia/terminal
+       url = https://github.com/zyedidia/terminal

diff --git a/cmd/micro/vendor/github.com/james4k/terminal b/cmd/micro/vendor/github.com/james4k/terminal
deleted file mode 160000 (submodule)
index b4bcb6e..0000000
--- a/cmd/micro/vendor/github.com/james4k/terminal
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b4bcb6ee7c08ae4930eecdeb1ba90073c5f40d71

diff --git a/cmd/micro/vendor/github.com/zyedidia/terminal b/cmd/micro/vendor/github.com/zyedidia/terminal
new file mode 160000 (submodule)
index 0000000..7281cdf
--- /dev/null
+++ b/cmd/micro/vendor/github.com/zyedidia/terminal
@@ -0,0 +1 @@
+Subproject commit 7281cdf385148d6feb5f2e401ed82e9193013a00

diff --git a/cmd/micro/view.go b/cmd/micro/view.go
index 9172eeaa237ff85678555b89944690d6d2c70627..b4638ab50baa8dfbe6ad79b4da89832137cdccb6 100644 (file)
--- a/cmd/micro/view.go
+++ b/cmd/micro/view.go
@@ -9,8 +9,8 @@ import (
        "strings"
        "time"
 
-       "github.com/james4k/terminal"
        "github.com/zyedidia/tcell"
+       "github.com/zyedidia/terminal"
 )
 
 // The ViewType defines what kind of view this is
@@ -557,7 +557,7 @@ func (v *View) SetCursor(c *Cursor) bool {
 // HandleEvent handles an event passed by the main loop
 func (v *View) HandleEvent(event tcell.Event) {
        if v.Type == vtTerm {
-               if _, ok := event.(*tcell.EventMouse); !ok {
+               if _, ok := event.(*tcell.EventMouse); !ok || v.termState.Mode(terminal.ModeMouseMask) {
                        v.pty.WriteString(event.EscSeq())
                }
                return

diff --git a/runtime/syntax/syntax_converter.go b/runtime/syntax/syntax_converter.go
index 9dfe4bb8c3df0224311cef3dd8858a3ddccb5e28..037a4bd4aa48f6c7a41732bf09dae5ed3c6b1188 100644 (file)
--- a/runtime/syntax/syntax_converter.go
+++ b/runtime/syntax/syntax_converter.go
@@ -24,7 +24,6 @@ type MultiRule struct {
 func JoinRule(rule string) string {
        split := strings.Split(rule, `" "`)
        joined := strings.Join(split, "|")
-       joined = joined
        return joined
 }