From 770cb87f7a1dd5846ec7b4100e37bf7d997feef1 Mon Sep 17 00:00:00 2001
From: Zachary Yedidia <zyedidia@gmail.com>
Date: Thu, 4 Jan 2018 21:46:44 -0500
Subject: [PATCH] Fix windows errors

---
 .gitmodules                                   | 6 +++---
 cmd/micro/vendor/github.com/james4k/terminal  | 1 -
 cmd/micro/vendor/github.com/zyedidia/terminal | 1 +
 cmd/micro/view.go                             | 4 ++--
 runtime/syntax/syntax_converter.go            | 1 -
 5 files changed, 6 insertions(+), 7 deletions(-)
 delete mode 160000 cmd/micro/vendor/github.com/james4k/terminal
 create mode 160000 cmd/micro/vendor/github.com/zyedidia/terminal

diff --git a/.gitmodules b/.gitmodules
index 86015815..5b8d9e41 100644
--- 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
index b4bcb6ee..00000000
--- 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
index 00000000..7281cdf3
--- /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 9172eeaa..b4638ab5 100644
--- 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 9dfe4bb8..037a4bd4 100644
--- 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
 }