Add support for COLORTERM

Fix ini comment highlighting
Fixes #1094
2026-03-31 23:27:10 +09:00 · 2018-06-03 17:07:44 -04:00 · 2018-05-12 21:29:02 -04:00 · 2018-04-28 17:42:17 -04:00 · 2018-04-28 17:16:22 -04:00 · 2018-04-28 17:04:47 -04:00
46 changed files with 2852 additions and 442 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -61,3 +61,12 @@
 [submodule "cmd/micro/vendor/github.com/zyedidia/pty"]
 	path = cmd/micro/vendor/github.com/zyedidia/pty
 	url = https://github.com/zyedidia/pty
+[submodule "cmd/micro/vendor/github.com/smartystreets/goconvey"]
+	path = cmd/micro/vendor/github.com/smartystreets/goconvey
+	url = https://github.com/smartystreets/goconvey
+[submodule "cmd/micro/vendor/github.com/jtolds/gls"]
+	path = cmd/micro/vendor/github.com/jtolds/gls
+	url = https://github.com/jtolds/gls
+[submodule "cmd/micro/vendor/github.com/smartystreets/assertions"]
+	path = cmd/micro/vendor/github.com/smartystreets/assertions
+	url = https://github.com/smartystreets/assertions
--- a/242
+++ b/242
@@ -58,7 +58,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.


-
 github.com/gdamore/encoding/LICENSE
 ================

@@ -395,7 +394,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.


-github.com/zyedidia/clipboard/LICENSE
+github.com/atotto/clipboard/LICENSE
+================
+github.com/zyedidia/clipboard/LICENSE (fork)
 ================

 Copyright (c) 2013 Ato Araki. All rights reserved.
@@ -427,7 +428,9 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


-github.com/zyedidia/tcell/LICENSE
+github.com/gdamore/tcell/LICENSE
+================
+github.com/zyedidia/tcell/LICENSE (fork)
 ================


@@ -665,39 +668,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-
-golang.org/x/sys/LICENSE
-================
-
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
 golang.org/x/text/LICENSE
 ================

@@ -1167,6 +1137,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

 github.com/james4k/terminal/LICENSE
 ================
+github.com/zyedidia/terminal/LICENSE (fork)
+================

 Copyright (C) 2013 James Gray

@@ -1190,6 +1162,8 @@ SOFTWARE.

 github.com/kr/pty/License
 ================
+github.com/zyedidia/pty/License (fork)
+================

 Copyright (c) 2011 Keith Rarick

@@ -1214,3 +1188,199 @@ OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
 OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
 OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+github.com/smartystreets/goconvey/LICENSE.md
+================
+
+Copyright (c) 2016 SmartyStreets, LLC
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+NOTE: Various optional and subordinate components carry their own licensing
+requirements and restrictions.  Use of those components is subject to the terms
+and conditions outlined the respective license of each component.
+
+github.com/smartystreets/assertions/LICENSE.md
+================
+
+Copyright (c) 2016 SmartyStreets, LLC
+
+Permission is hereby granted, free of charge, to any person obtaining a copy 
+of this software and associated documentation files (the "Software"), to deal 
+in the Software without restriction, including without limitation the rights 
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
+copies of the Software, and to permit persons to whom the Software is 
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all 
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
+SOFTWARE.
+
+NOTE: Various optional and subordinate components carry their own licensing
+requirements and restrictions.  Use of those components is subject to the terms
+and conditions outlined the respective license of each component.
+
+github.com/jtolds/gls/LICENSE
+================
+
+Copyright (c) 2013, Space Monkey, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+github.com/npat-efault/poller/LICENSE.txt
+================
+github.com/zyedidia/poller/LICENSE.txt (fork)
+================
+
+Copyright (c) 2014, Nick Patavalis (npat@efault.net)
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+github.com/zyedidia/glob
+================
+
+Glob is licensed under the MIT "Expat" License:
+
+Copyright (c) 2016: Zachary Yedidia.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+github.com/dustin/go-humanize/LICENSE
+================
+
+Copyright (c) 2005-2008  Dustin Sallings <dustin@spy.net>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+<http://www.opensource.org/licenses/mit-license.php>
+
+gopkg.in/yaml.v2/LICENSE
+================
+
+Copyright 2011-2016 Canonical Ltd.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+github.com/lucasb-eyer/go-colorful/LICENSE
+================
+
+Copyright (c) 2013 Lucas Beyer
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
--- a/assets/logo.png
+++ b/assets/logo.png
--- a/assets/micro-solarized.png
+++ b/assets/micro-solarized.png
--- a/assets/packaging/micro.1
+++ b/assets/packaging/micro.1
@@ -7,16 +7,13 @@
 .\" See \usr\share\doc\micro\LICENSE for more information.
 .TH micro 1 "2017-03-28"
 .SH NAME
-micro \- An intuitive and modern terminal text editor
-.
+micro \- A modern and intuitive terminal-based text editor
 .SH SYNOPSIS
 .B micro
-.RB []
-[
-.I "filename \&..."
-]
+.RB [OPTIONS]
+[FILE]\&...
+
 .SH DESCRIPTION
-( Copied from the README file. )

 Micro is a terminal-based text editor that aims to be easy to use and intuitive, while also taking advantage of the full capabilities
 of modern terminals. It comes as one single, batteries-included, static binary with no dependencies.
@@ -25,19 +22,39 @@ As the name indicates, micro aims to be somewhat of a successor to the nano edit
 enjoyable to use full time, whether you work in the terminal because you prefer it (like me), or because you need to (over ssh).

 .SH OPTIONS
-.B \-v --version
-Displays the current version of micro and the git commit hash. 
-.TP
-.SH ENVIRONMENT
-Micro's behaviour can be changed by setting environment variables, of which 
-there is currently only one:
-.I MICRO_TRUE_COLOR
+.PP
+\-config-dir dir
+.RS 4
+Specify a custom location for the configuration directory
+.RE
+.PP
+\-startpos LINE,COL
+.RS 4
+Specify a line and column to start the cursor at when opening a buffer
+.RE
+.PP
+\-options
+.RS 4
+Show all option help
+.RE
+.PP
+\-version
+.RS 4
+Show the version number and information
+.RE

-When MICRO_TRUE_COLOR is set to 1, micro will attempt to treat your terminal as
-a true-color terminal and will be able to make full use of the true-color colorschemes
-that are included with micro. If MICRO_TRUE_COLOR is not set or is set to 0, then
-micro will only make use of 256 color features and will internally map true-color
-colorschemes to the nearest colors available. For more information see micro's documentation.
+.SH CONFIGURATION
+
+Micro uses
+\fI$XDG_CONFIG_HOME/micro\fR
+for configuration by default. If it is not set, micro uses ~/.config/micro.
+Two main configuration files are settings.json, containing the user's
+settings, and bindings.json, containing the user's custom keybindings.
+
+.SH ENVIRONMENT
+Micro's behaviour can be changed by setting environment variables, of which there is currently only one:
+\fIMICRO_TRUECOLOR\fR.
+When MICRO_TRUECOLOR is set to 1, micro will attempt to treat your terminal as a true-color terminal and will be able to make full use of the true-color colorschemes that are included with micro. If MICRO_TRUECOLOR is not set or is set to 0, then micro will only make use of 256 color features and will internally map true-color colorschemes to the nearest colors available. For more information see micro's documentation.

 .SH NOTICE
 This manpage is intended only to serve as a quick guide to the invocation of 
--- a/cmd/micro/actions.go
+++ b/cmd/micro/actions.go
@@ -7,6 +7,7 @@ import (
 	"strconv"
 	"strings"
 	"time"
+	"unicode/utf8"

 	"github.com/yuin/gopher-lua"
 	"github.com/zyedidia/clipboard"
@@ -434,7 +435,11 @@ func (v *View) StartOfLine(usePlugin bool) bool {

 	v.deselect(0)

-	v.Cursor.Start()
+	if v.Cursor.X != 0 {
+		v.Cursor.Start()
+	} else {
+		v.Cursor.StartOfText()
+	}

 	if usePlugin {
 		return PostActionCall("StartOfLine", v)
@@ -742,9 +747,9 @@ func (v *View) Backspace(usePlugin bool) bool {
 		// If the user is using spaces instead of tabs and they are deleting
 		// whitespace at the start of the line, we should delete as if it's a
 		// tab (tabSize number of spaces)
-		lineStart := v.Buf.Line(v.Cursor.Y)[:v.Cursor.X]
+		lineStart := sliceEnd(v.Buf.LineBytes(v.Cursor.Y), v.Cursor.X)
 		tabSize := int(v.Buf.Settings["tabsize"].(float64))
-		if v.Buf.Settings["tabstospaces"].(bool) && IsSpaces(lineStart) && len(lineStart) != 0 && len(lineStart)%tabSize == 0 {
+		if v.Buf.Settings["tabstospaces"].(bool) && IsSpaces(lineStart) && utf8.RuneCount(lineStart) != 0 && utf8.RuneCount(lineStart)%tabSize == 0 {
 			loc := v.Cursor.Loc
 			v.Buf.Remove(loc.Move(-tabSize, v.Buf), loc)
 		} else {
@@ -946,7 +951,7 @@ func (v *View) SaveAll(usePlugin bool) bool {
 		}

 		for _, t := range tabs {
-			for _, v := range t.views {
+			for _, v := range t.Views {
 				v.Save(false)
 			}
 		}
@@ -1015,7 +1020,7 @@ func (v *View) saveToFile(filename string) {
 // SaveAs saves the buffer to disk with the given name
 func (v *View) SaveAs(usePlugin bool) bool {
 	if v.mainCursor() {
-		if usePlugin && !PreActionCall("Find", v) {
+		if usePlugin && !PreActionCall("SaveAs", v) {
 			return false
 		}

@@ -1032,7 +1037,7 @@ func (v *View) SaveAs(usePlugin bool) bool {
 		}

 		if usePlugin {
-			PostActionCall("Find", v)
+			PostActionCall("SaveAs", v)
 		}
 	}
 	return false
@@ -1214,9 +1219,9 @@ func (v *View) Cut(usePlugin bool) bool {
 			return PostActionCall("Cut", v)
 		}
 		return true
+	} else {
+		return v.CutLine(usePlugin)
 	}
-
-	return false
 }

 // DuplicateLine duplicates the current line or selection
@@ -1803,12 +1808,12 @@ func (v *View) Quit(usePlugin bool) bool {
 		// Make sure not to quit if there are unsaved changes
 		if v.CanClose() {
 			v.CloseBuffer()
-			if len(tabs[curTab].views) > 1 {
+			if len(tabs[curTab].Views) > 1 {
 				v.splitNode.Delete()
 				tabs[v.TabNum].Cleanup()
 				tabs[v.TabNum].Resize()
 			} else if len(tabs) > 1 {
-				if len(tabs[v.TabNum].views) == 1 {
+				if len(tabs[v.TabNum].Views) == 1 {
 					tabs = tabs[:v.TabNum+copy(tabs[v.TabNum:], tabs[v.TabNum+1:])]
 					for i, t := range tabs {
 						t.SetNum(i)
@@ -1847,7 +1852,7 @@ func (v *View) QuitAll(usePlugin bool) bool {

 		closeAll := true
 		for _, tab := range tabs {
-			for _, v := range tab.views {
+			for _, v := range tab.Views {
 				if !v.CanClose() {
 					closeAll = false
 				}
@@ -1860,7 +1865,7 @@ func (v *View) QuitAll(usePlugin bool) bool {

 			if shouldQuit {
 				for _, tab := range tabs {
-					for _, v := range tab.views {
+					for _, v := range tab.Views {
 						v.CloseBuffer()
 					}
 				}
@@ -1892,7 +1897,7 @@ func (v *View) AddTab(usePlugin bool) bool {
 		curTab = len(tabs) - 1
 		if len(tabs) == 2 {
 			for _, t := range tabs {
-				for _, v := range t.views {
+				for _, v := range t.Views {
 					v.ToggleTabbar()
 				}
 			}
@@ -1985,8 +1990,8 @@ func (v *View) Unsplit(usePlugin bool) bool {
 		}

 		curView := tabs[curTab].CurView
-		for i := len(tabs[curTab].views) - 1; i >= 0; i-- {
-			view := tabs[curTab].views[i]
+		for i := len(tabs[curTab].Views) - 1; i >= 0; i-- {
+			view := tabs[curTab].Views[i]
 			if view != nil && view.Num != curView {
 				view.Quit(true)
 				// messenger.Message("Quit ", view.Buf.Path)
@@ -2008,7 +2013,7 @@ func (v *View) NextSplit(usePlugin bool) bool {
 		}

 		tab := tabs[curTab]
-		if tab.CurView < len(tab.views)-1 {
+		if tab.CurView < len(tab.Views)-1 {
 			tab.CurView++
 		} else {
 			tab.CurView = 0
@@ -2032,7 +2037,7 @@ func (v *View) PreviousSplit(usePlugin bool) bool {
 		if tab.CurView > 0 {
 			tab.CurView--
 		} else {
-			tab.CurView = len(tab.views) - 1
+			tab.CurView = len(tab.Views) - 1
 		}

 		if usePlugin {
@@ -2143,6 +2148,54 @@ func (v *View) SpawnMultiCursor(usePlugin bool) bool {
 	return false
 }

+// SpawnMultiCursorSelect adds a cursor at the beginning of each line of a selection
+func (v *View) SpawnMultiCursorSelect(usePlugin bool) bool {
+	if v.Cursor == &v.Buf.Cursor {
+		if usePlugin && !PreActionCall("SpawnMultiCursorSelect", v) {
+			return false
+		}
+
+		// Avoid cases where multiple cursors already exist, that would create problems
+		if len(v.Buf.cursors) > 1 {
+			return false
+		}
+
+		var startLine int
+		var endLine int
+
+		a, b := v.Cursor.CurSelection[0].Y, v.Cursor.CurSelection[1].Y
+		if a > b {
+			startLine, endLine = b, a
+		} else {
+			startLine, endLine = a, b
+		}
+
+		if v.Cursor.HasSelection() {
+			v.Cursor.ResetSelection()
+			v.Cursor.GotoLoc(Loc{0, startLine})
+
+			for i := startLine; i <= endLine; i++ {
+				c := &Cursor{
+					buf: v.Buf,
+				}
+				c.GotoLoc(Loc{0, i})
+				v.Buf.cursors = append(v.Buf.cursors, c)
+			}
+			v.Buf.MergeCursors()
+			v.Buf.UpdateCursors()
+		} else {
+			return false
+		}
+
+		if usePlugin {
+			PostActionCall("SpawnMultiCursorSelect", v)
+		}
+
+		messenger.Message("Added cursors from selection")
+	}
+	return false
+}
+
 // MouseMultiCursor is a mouse action which puts a new cursor at the mouse position
 func (v *View) MouseMultiCursor(usePlugin bool, e *tcell.EventMouse) bool {
 	if v.Cursor == &v.Buf.Cursor {
--- a/cmd/micro/bindings.go
+++ b/cmd/micro/bindings.go
@@ -23,96 +23,97 @@ var mouseBindingActions = map[string]func(*View, bool, *tcell.EventMouse) bool{
 }

 var bindingActions = map[string]func(*View, bool) bool{
-	"CursorUp":              (*View).CursorUp,
-	"CursorDown":            (*View).CursorDown,
-	"CursorPageUp":          (*View).CursorPageUp,
-	"CursorPageDown":        (*View).CursorPageDown,
-	"CursorLeft":            (*View).CursorLeft,
-	"CursorRight":           (*View).CursorRight,
-	"CursorStart":           (*View).CursorStart,
-	"CursorEnd":             (*View).CursorEnd,
-	"SelectToStart":         (*View).SelectToStart,
-	"SelectToEnd":           (*View).SelectToEnd,
-	"SelectUp":              (*View).SelectUp,
-	"SelectDown":            (*View).SelectDown,
-	"SelectLeft":            (*View).SelectLeft,
-	"SelectRight":           (*View).SelectRight,
-	"WordRight":             (*View).WordRight,
-	"WordLeft":              (*View).WordLeft,
-	"SelectWordRight":       (*View).SelectWordRight,
-	"SelectWordLeft":        (*View).SelectWordLeft,
-	"DeleteWordRight":       (*View).DeleteWordRight,
-	"DeleteWordLeft":        (*View).DeleteWordLeft,
-	"SelectLine":            (*View).SelectLine,
-	"SelectToStartOfLine":   (*View).SelectToStartOfLine,
-	"SelectToEndOfLine":     (*View).SelectToEndOfLine,
-	"ParagraphPrevious":     (*View).ParagraphPrevious,
-	"ParagraphNext":         (*View).ParagraphNext,
-	"InsertNewline":         (*View).InsertNewline,
-	"InsertSpace":           (*View).InsertSpace,
-	"Backspace":             (*View).Backspace,
-	"Delete":                (*View).Delete,
-	"InsertTab":             (*View).InsertTab,
-	"Save":                  (*View).Save,
-	"SaveAll":               (*View).SaveAll,
-	"SaveAs":                (*View).SaveAs,
-	"Find":                  (*View).Find,
-	"FindNext":              (*View).FindNext,
-	"FindPrevious":          (*View).FindPrevious,
-	"Center":                (*View).Center,
-	"Undo":                  (*View).Undo,
-	"Redo":                  (*View).Redo,
-	"Copy":                  (*View).Copy,
-	"Cut":                   (*View).Cut,
-	"CutLine":               (*View).CutLine,
-	"DuplicateLine":         (*View).DuplicateLine,
-	"DeleteLine":            (*View).DeleteLine,
-	"MoveLinesUp":           (*View).MoveLinesUp,
-	"MoveLinesDown":         (*View).MoveLinesDown,
-	"IndentSelection":       (*View).IndentSelection,
-	"OutdentSelection":      (*View).OutdentSelection,
-	"OutdentLine":           (*View).OutdentLine,
-	"Paste":                 (*View).Paste,
-	"PastePrimary":          (*View).PastePrimary,
-	"SelectAll":             (*View).SelectAll,
-	"OpenFile":              (*View).OpenFile,
-	"Start":                 (*View).Start,
-	"End":                   (*View).End,
-	"PageUp":                (*View).PageUp,
-	"PageDown":              (*View).PageDown,
-	"HalfPageUp":            (*View).HalfPageUp,
-	"HalfPageDown":          (*View).HalfPageDown,
-	"StartOfLine":           (*View).StartOfLine,
-	"EndOfLine":             (*View).EndOfLine,
-	"ToggleHelp":            (*View).ToggleHelp,
-	"ToggleKeyMenu":         (*View).ToggleKeyMenu,
-	"ToggleRuler":           (*View).ToggleRuler,
-	"JumpLine":              (*View).JumpLine,
-	"ClearStatus":           (*View).ClearStatus,
-	"ShellMode":             (*View).ShellMode,
-	"CommandMode":           (*View).CommandMode,
-	"ToggleOverwriteMode":   (*View).ToggleOverwriteMode,
-	"Escape":                (*View).Escape,
-	"Quit":                  (*View).Quit,
-	"QuitAll":               (*View).QuitAll,
-	"AddTab":                (*View).AddTab,
-	"PreviousTab":           (*View).PreviousTab,
-	"NextTab":               (*View).NextTab,
-	"NextSplit":             (*View).NextSplit,
-	"PreviousSplit":         (*View).PreviousSplit,
-	"Unsplit":               (*View).Unsplit,
-	"VSplit":                (*View).VSplitBinding,
-	"HSplit":                (*View).HSplitBinding,
-	"ToggleMacro":           (*View).ToggleMacro,
-	"PlayMacro":             (*View).PlayMacro,
-	"Suspend":               (*View).Suspend,
-	"ScrollUp":              (*View).ScrollUpAction,
-	"ScrollDown":            (*View).ScrollDownAction,
-	"SpawnMultiCursor":      (*View).SpawnMultiCursor,
-	"RemoveMultiCursor":     (*View).RemoveMultiCursor,
-	"RemoveAllMultiCursors": (*View).RemoveAllMultiCursors,
-	"SkipMultiCursor":       (*View).SkipMultiCursor,
-	"JumpToMatchingBrace":   (*View).JumpToMatchingBrace,
+	"CursorUp":               (*View).CursorUp,
+	"CursorDown":             (*View).CursorDown,
+	"CursorPageUp":           (*View).CursorPageUp,
+	"CursorPageDown":         (*View).CursorPageDown,
+	"CursorLeft":             (*View).CursorLeft,
+	"CursorRight":            (*View).CursorRight,
+	"CursorStart":            (*View).CursorStart,
+	"CursorEnd":              (*View).CursorEnd,
+	"SelectToStart":          (*View).SelectToStart,
+	"SelectToEnd":            (*View).SelectToEnd,
+	"SelectUp":               (*View).SelectUp,
+	"SelectDown":             (*View).SelectDown,
+	"SelectLeft":             (*View).SelectLeft,
+	"SelectRight":            (*View).SelectRight,
+	"WordRight":              (*View).WordRight,
+	"WordLeft":               (*View).WordLeft,
+	"SelectWordRight":        (*View).SelectWordRight,
+	"SelectWordLeft":         (*View).SelectWordLeft,
+	"DeleteWordRight":        (*View).DeleteWordRight,
+	"DeleteWordLeft":         (*View).DeleteWordLeft,
+	"SelectLine":             (*View).SelectLine,
+	"SelectToStartOfLine":    (*View).SelectToStartOfLine,
+	"SelectToEndOfLine":      (*View).SelectToEndOfLine,
+	"ParagraphPrevious":      (*View).ParagraphPrevious,
+	"ParagraphNext":          (*View).ParagraphNext,
+	"InsertNewline":          (*View).InsertNewline,
+	"InsertSpace":            (*View).InsertSpace,
+	"Backspace":              (*View).Backspace,
+	"Delete":                 (*View).Delete,
+	"InsertTab":              (*View).InsertTab,
+	"Save":                   (*View).Save,
+	"SaveAll":                (*View).SaveAll,
+	"SaveAs":                 (*View).SaveAs,
+	"Find":                   (*View).Find,
+	"FindNext":               (*View).FindNext,
+	"FindPrevious":           (*View).FindPrevious,
+	"Center":                 (*View).Center,
+	"Undo":                   (*View).Undo,
+	"Redo":                   (*View).Redo,
+	"Copy":                   (*View).Copy,
+	"Cut":                    (*View).Cut,
+	"CutLine":                (*View).CutLine,
+	"DuplicateLine":          (*View).DuplicateLine,
+	"DeleteLine":             (*View).DeleteLine,
+	"MoveLinesUp":            (*View).MoveLinesUp,
+	"MoveLinesDown":          (*View).MoveLinesDown,
+	"IndentSelection":        (*View).IndentSelection,
+	"OutdentSelection":       (*View).OutdentSelection,
+	"OutdentLine":            (*View).OutdentLine,
+	"Paste":                  (*View).Paste,
+	"PastePrimary":           (*View).PastePrimary,
+	"SelectAll":              (*View).SelectAll,
+	"OpenFile":               (*View).OpenFile,
+	"Start":                  (*View).Start,
+	"End":                    (*View).End,
+	"PageUp":                 (*View).PageUp,
+	"PageDown":               (*View).PageDown,
+	"HalfPageUp":             (*View).HalfPageUp,
+	"HalfPageDown":           (*View).HalfPageDown,
+	"StartOfLine":            (*View).StartOfLine,
+	"EndOfLine":              (*View).EndOfLine,
+	"ToggleHelp":             (*View).ToggleHelp,
+	"ToggleKeyMenu":          (*View).ToggleKeyMenu,
+	"ToggleRuler":            (*View).ToggleRuler,
+	"JumpLine":               (*View).JumpLine,
+	"ClearStatus":            (*View).ClearStatus,
+	"ShellMode":              (*View).ShellMode,
+	"CommandMode":            (*View).CommandMode,
+	"ToggleOverwriteMode":    (*View).ToggleOverwriteMode,
+	"Escape":                 (*View).Escape,
+	"Quit":                   (*View).Quit,
+	"QuitAll":                (*View).QuitAll,
+	"AddTab":                 (*View).AddTab,
+	"PreviousTab":            (*View).PreviousTab,
+	"NextTab":                (*View).NextTab,
+	"NextSplit":              (*View).NextSplit,
+	"PreviousSplit":          (*View).PreviousSplit,
+	"Unsplit":                (*View).Unsplit,
+	"VSplit":                 (*View).VSplitBinding,
+	"HSplit":                 (*View).HSplitBinding,
+	"ToggleMacro":            (*View).ToggleMacro,
+	"PlayMacro":              (*View).PlayMacro,
+	"Suspend":                (*View).Suspend,
+	"ScrollUp":               (*View).ScrollUpAction,
+	"ScrollDown":             (*View).ScrollDownAction,
+	"SpawnMultiCursor":       (*View).SpawnMultiCursor,
+	"SpawnMultiCursorSelect": (*View).SpawnMultiCursorSelect,
+	"RemoveMultiCursor":      (*View).RemoveMultiCursor,
+	"RemoveAllMultiCursors":  (*View).RemoveAllMultiCursors,
+	"SkipMultiCursor":        (*View).SkipMultiCursor,
+	"JumpToMatchingBrace":    (*View).JumpToMatchingBrace,

 	// This was changed to InsertNewline but I don't want to break backwards compatibility
 	"InsertEnter": (*View).InsertNewline,
@@ -337,6 +338,10 @@ modSearch:
 		}
 	}

+	if len(k) == 0 {
+		return Key{buttons: -1}, false
+	}
+
 	// Control is handled specially, since some character codes in bindingKeys
 	// are different when Control is depressed. We should check for Control keys
 	// first.
@@ -600,6 +605,7 @@ func DefaultBindings() map[string]string {
 		"Ctrl-MouseLeft": "MouseMultiCursor",

 		"Alt-n": "SpawnMultiCursor",
+		"Alt-m": "SpawnMultiCursorSelect",
 		"Alt-p": "RemoveMultiCursor",
 		"Alt-c": "RemoveAllMultiCursors",
 		"Alt-x": "SkipMultiCursor",
--- a/cmd/micro/buffer.go
+++ b/cmd/micro/buffer.go
@@ -74,6 +74,33 @@ type SerializedBuffer struct {
 	ModTime      time.Time
 }

+// NewBufferFromFile opens a new buffer using the given filepath
+// It will also automatically handle `~`, and line/column with filename:l:c
+// It will return an empty buffer if the filepath does not exist
+// and an error if the file is a directory
+func NewBufferFromFile(path string) (*Buffer, error) {
+	filename := GetPath(path)
+	filename = ReplaceHome(filename)
+	file, err := os.Open(filename)
+	fileInfo, _ := os.Stat(filename)
+
+	if err == nil && fileInfo.IsDir() {
+		return nil, errors.New(filename + " is a directory")
+	}
+
+	defer file.Close()
+
+	var buf *Buffer
+	if err != nil {
+		// File does not exist -- create an empty buffer with that name
+		buf = NewBufferFromString("", path)
+	} else {
+		buf = NewBuffer(file, FSize(file), path)
+	}
+
+	return buf, nil
+}
+
 // NewBufferFromString creates a new buffer containing the given
 // string
 func NewBufferFromString(text, path string) *Buffer {
@@ -82,9 +109,29 @@ func NewBufferFromString(text, path string) *Buffer {

 // NewBuffer creates a new buffer from a given reader with a given path
 func NewBuffer(reader io.Reader, size int64, path string) *Buffer {
+	startpos := Loc{0, 0}
+	startposErr := true
+	if strings.Contains(path, ":") {
+		var err error
+		split := strings.Split(path, ":")
+		path = split[0]
+		startpos.Y, err = strconv.Atoi(split[1])
+		if err != nil {
+			messenger.Error("Error opening file: ", err)
+		} else {
+			startposErr = false
+			if len(split) > 2 {
+				startpos.X, err = strconv.Atoi(split[2])
+				if err != nil {
+					messenger.Error("Error opening file: ", err)
+				}
+			}
+		}
+	}
+
 	if path != "" {
 		for _, tab := range tabs {
-			for _, view := range tab.views {
+			for _, view := range tab.Views {
 				if view.Buf.Path == path {
 					return view.Buf
 				}
@@ -129,11 +176,18 @@ func NewBuffer(reader io.Reader, size int64, path string) *Buffer {
 	cursorStartX := 0
 	cursorStartY := 0
 	// If -startpos LINE,COL was passed, use start position LINE,COL
-	if len(*flagStartPos) > 0 {
+	if len(*flagStartPos) > 0 || !startposErr {
 		positions := strings.Split(*flagStartPos, ",")
-		if len(positions) == 2 {
-			lineNum, errPos1 := strconv.Atoi(positions[0])
-			colNum, errPos2 := strconv.Atoi(positions[1])
+		if len(positions) == 2 || !startposErr {
+			var lineNum, colNum int
+			var errPos1, errPos2 error
+			if !startposErr {
+				lineNum = startpos.Y
+				colNum = startpos.X
+			} else {
+				lineNum, errPos1 = strconv.Atoi(positions[0])
+				colNum, errPos2 = strconv.Atoi(positions[1])
+			}
 			if errPos1 == nil && errPos2 == nil {
 				cursorStartX = colNum
 				cursorStartY = lineNum - 1
@@ -162,10 +216,11 @@ func NewBuffer(reader io.Reader, size int64, path string) *Buffer {

 	InitLocalSettings(b)

-	if len(*flagStartPos) == 0 && (b.Settings["savecursor"].(bool) || b.Settings["saveundo"].(bool)) {
+	if startposErr && len(*flagStartPos) == 0 && (b.Settings["savecursor"].(bool) || b.Settings["saveundo"].(bool)) {
 		// If either savecursor or saveundo is turned on, we need to load the serialized information
 		// from ~/.config/micro/buffers
 		file, err := os.Open(configDir + "/buffers/" + EscapePath(b.AbsPath))
+		defer file.Close()
 		if err == nil {
 			var buffer SerializedBuffer
 			decoder := gob.NewDecoder(file)
@@ -188,7 +243,6 @@ func NewBuffer(reader io.Reader, size int64, path string) *Buffer {
 				}
 			}
 		}
-		file.Close()
 	}

 	if !b.Settings["fastdirty"].(bool) {
@@ -451,6 +505,7 @@ func (b *Buffer) SaveAs(filename string) error {
 	}

 	f, err := os.OpenFile(absFilename, os.O_WRONLY|os.O_CREATE, 0644)
+	defer f.Close()
 	if err != nil {
 		return err
 	}
@@ -458,16 +513,20 @@ func (b *Buffer) SaveAs(filename string) error {
 		return err
 	}
 	useCrlf := b.Settings["fileformat"] == "dos"
+	size := 0
 	for i, l := range b.lines {
+		size += len(l.data)
 		if _, err := f.Write(l.data); err != nil {
 			return err
 		}
 		if i != len(b.lines)-1 {
 			if useCrlf {
+				size += 2
 				if _, err := f.Write([]byte{'\r', '\n'}); err != nil {
 					return err
 				}
 			} else {
+				size++
 				if _, err := f.Write([]byte{'\n'}); err != nil {
 					return err
 				}
@@ -475,6 +534,15 @@ func (b *Buffer) SaveAs(filename string) error {
 		}
 	}

+	if !b.Settings["fastdirty"].(bool) {
+		if size > 50000 {
+			// If the file is larger than a megabyte fastdirty needs to be on
+			b.Settings["fastdirty"] = true
+		} else {
+			b.origHash = md5.Sum([]byte(b.String()))
+		}
+	}
+
 	b.Path = filename
 	b.IsModified = false
 	return b.Serialize()
@@ -556,13 +624,29 @@ func (b *Buffer) End() Loc {

 // RuneAt returns the rune at a given location in the buffer
 func (b *Buffer) RuneAt(loc Loc) rune {
-	line := []rune(b.Line(loc.Y))
+	line := b.LineRunes(loc.Y)
 	if len(line) > 0 {
 		return line[loc.X]
 	}
 	return '\n'
 }

+// Line returns a single line as an array of runes
+func (b *Buffer) LineBytes(n int) []byte {
+	if n >= len(b.lines) {
+		return []byte{}
+	}
+	return b.lines[n].data
+}
+
+// Line returns a single line as an array of runes
+func (b *Buffer) LineRunes(n int) []rune {
+	if n >= len(b.lines) {
+		return []rune{}
+	}
+	return toRunes(b.lines[n].data)
+}
+
 // Line returns a single line
 func (b *Buffer) Line(n int) string {
 	if n >= len(b.lines) {
@@ -654,21 +738,21 @@ func (b *Buffer) clearCursors() {
 }

 var bracePairs = [][2]rune{
-	[2]rune{'(', ')'},
-	[2]rune{'{', '}'},
-	[2]rune{'[', ']'},
+	{'(', ')'},
+	{'{', '}'},
+	{'[', ']'},
 }

 // FindMatchingBrace returns the location in the buffer of the matching bracket
 // It is given a brace type containing the open and closing character, (for example
 // '{' and '}') as well as the location to match from
 func (b *Buffer) FindMatchingBrace(braceType [2]rune, start Loc) Loc {
-	curLine := []rune(string(b.lines[start.Y].data))
+	curLine := b.LineRunes(start.Y)
 	startChar := curLine[start.X]
 	var i int
 	if startChar == braceType[0] {
 		for y := start.Y; y < b.NumLines; y++ {
-			l := []rune(string(b.lines[y].data))
+			l := b.LineRunes(y)
 			xInit := 0
 			if y == start.Y {
 				xInit = start.X
--- a/cmd/micro/cellview.go
+++ b/cmd/micro/cellview.go
@@ -73,9 +73,18 @@ func (c *CellView) Draw(buf *Buffer, top, height, left, width int) {
 	// bracePairs is defined in buffer.go
 	if buf.Settings["matchbrace"].(bool) {
 		for _, bp := range bracePairs {
-			r := buf.Cursor.RuneUnder(buf.Cursor.X)
+			curX := buf.Cursor.X
+			curLoc := buf.Cursor.Loc
+			if buf.Settings["matchbraceleft"].(bool) {
+				curX--
+				if curX > 0 {
+					curLoc = curLoc.Move(-1, buf)
+				}
+			}
+
+			r := buf.Cursor.RuneUnder(curX)
 			if r == bp[0] || r == bp[1] {
-				matchingBrace = buf.FindMatchingBrace(bp, buf.Cursor.Loc)
+				matchingBrace = buf.FindMatchingBrace(bp, curLoc)
 			}
 		}
 	}
@@ -85,7 +94,7 @@ func (c *CellView) Draw(buf *Buffer, top, height, left, width int) {
 	indentrunes := []rune(buf.Settings["indentchar"].(string))
 	// if empty indentchar settings, use space
 	if indentrunes == nil || len(indentrunes) == 0 {
-		indentrunes = []rune(" ")
+		indentrunes = []rune{' '}
 	}
 	indentchar := indentrunes[0]

--- a/cmd/micro/command.go
+++ b/cmd/micro/command.go
@@ -8,6 +8,7 @@ import (
 	"runtime"
 	"strconv"
 	"strings"
+	"unicode/utf8"

 	humanize "github.com/dustin/go-humanize"
 	"github.com/zyedidia/micro/cmd/micro/shellwords"
@@ -176,7 +177,7 @@ func PluginCmd(args []string) {
 					continue
 				}
 			}
-			if !IsSpaces(removed) {
+			if !IsSpaces([]byte(removed)) {
 				messenger.Message("Removed ", removed)
 			} else {
 				messenger.Error("The requested plugins do not exist")
@@ -245,7 +246,7 @@ func Raw(args []string) {
 	curTab = len(tabs) - 1
 	if len(tabs) == 2 {
 		for _, t := range tabs {
-			for _, v := range t.views {
+			for _, v := range t.Views {
 				v.ToggleTabbar()
 			}
 		}
@@ -261,7 +262,7 @@ func TabSwitch(args []string) {

 			found := false
 			for _, t := range tabs {
-				v := t.views[t.CurView]
+				v := t.Views[t.CurView]
 				if v.Buf.GetName() == args[0] {
 					curTab = v.TabNum
 					found = true
@@ -292,7 +293,7 @@ func Cd(args []string) {
 		}
 		wd, _ := os.Getwd()
 		for _, tab := range tabs {
-			for _, view := range tab.views {
+			for _, view := range tab.Views {
 				if len(view.Buf.name) == 0 {
 					continue
 				}
@@ -390,24 +391,10 @@ func VSplit(args []string) {
 	if len(args) == 0 {
 		CurView().VSplit(NewBufferFromString("", ""))
 	} else {
-		filename := args[0]
-		filename = ReplaceHome(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()
-
-		var buf *Buffer
+		buf, err := NewBufferFromFile(args[0])
 		if err != nil {
-			// File does not exist -- create an empty buffer with that name
-			buf = NewBufferFromString("", filename)
-		} else {
-			buf = NewBuffer(file, FSize(file), filename)
+			messenger.Error(err)
+			return
 		}
 		CurView().VSplit(buf)
 	}
@@ -419,24 +406,10 @@ func HSplit(args []string) {
 	if len(args) == 0 {
 		CurView().HSplit(NewBufferFromString("", ""))
 	} else {
-		filename := args[0]
-		filename = ReplaceHome(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()
-
-		var buf *Buffer
+		buf, err := NewBufferFromFile(args[0])
 		if err != nil {
-			// File does not exist -- create an empty buffer with that name
-			buf = NewBufferFromString("", filename)
-		} else {
-			buf = NewBuffer(file, FSize(file), filename)
+			messenger.Error(err)
+			return
 		}
 		CurView().HSplit(buf)
 	}
@@ -459,23 +432,10 @@ func NewTab(args []string) {
 	if len(args) == 0 {
 		CurView().AddTab(true)
 	} else {
-		filename := args[0]
-		filename = ReplaceHome(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()
-
-		var buf *Buffer
+		buf, err := NewBufferFromFile(args[0])
 		if err != nil {
-			buf = NewBufferFromString("", filename)
-		} else {
-			buf = NewBuffer(file, FSize(file), filename)
+			messenger.Error(err)
+			return
 		}

 		tab := NewTabFromView(NewView(buf))
@@ -484,7 +444,7 @@ func NewTab(args []string) {
 		curTab = len(tabs) - 1
 		if len(tabs) == 2 {
 			for _, t := range tabs {
-				for _, v := range t.views {
+				for _, v := range t.Views {
 					v.ToggleTabbar()
 				}
 			}
@@ -615,6 +575,7 @@ func Replace(args []string) {
 	}

 	replace := string(args[1])
+	replaceBytes := []byte(replace)

 	regex, err := regexp.Compile("(?m)" + search)
 	if err != nil {
@@ -628,23 +589,16 @@ func Replace(args []string) {
 	found := 0
 	replaceAll := func() {
 		var deltas []Delta
-		deltaXOffset := Count(replace) - Count(search)
 		for i := 0; i < view.Buf.LinesNum(); i++ {
-			matches := regex.FindAllIndex(view.Buf.lines[i].data, -1)
-			str := string(view.Buf.lines[i].data)
+			newText := regex.ReplaceAllFunc(view.Buf.lines[i].data, func(in []byte) []byte {
+				found++
+				return replaceBytes
+			})

-			if matches != nil {
-				xOffset := 0
-				for _, m := range matches {
-					from := Loc{runePos(m[0], str) + xOffset, i}
-					to := Loc{runePos(m[1], str) + xOffset, i}
+			from := Loc{0, i}
+			to := Loc{utf8.RuneCount(view.Buf.lines[i].data), i}

-					xOffset += deltaXOffset
-
-					deltas = append(deltas, Delta{replace, from, to})
-					found++
-				}
-			}
+			deltas = append(deltas, Delta{string(newText), from, to})
 		}
 		view.Buf.MultipleReplace(deltas)
 	}
--- a/cmd/micro/cursor.go
+++ b/cmd/micro/cursor.go
@@ -333,6 +333,18 @@ func (c *Cursor) Start() {
 	c.LastVisualX = c.GetVisualX()
 }

+// StartOfText moves the cursor to the first non-whitespace rune of 
+// the line it is on
+func (c *Cursor) StartOfText() {
+	c.Start()
+	for IsWhitespace(c.RuneUnder(c.X)) {
+		if c.X == Count(c.buf.Line(c.Y)) {
+			break
+		}
+		c.Right()
+	}
+}
+
 // GetCharPosInLine gets the char position of a visual x y
 // coordinate (this is necessary because tabs are 1 char but
 // 4 visual spaces)
--- a/cmd/micro/highlight/highlighter.go
+++ b/cmd/micro/highlight/highlighter.go
@@ -6,16 +6,50 @@ import (
 	"unicode/utf8"
 )

+func sliceStart(slc []byte, index int) []byte {
+	len := len(slc)
+	i := 0
+	totalSize := 0
+	for totalSize < len {
+		if i >= index {
+			return slc[totalSize:]
+		}
+
+		_, size := utf8.DecodeRune(slc[totalSize:])
+		totalSize += size
+		i++
+	}
+
+	return slc[totalSize:]
+}
+
+func sliceEnd(slc []byte, index int) []byte {
+	len := len(slc)
+	i := 0
+	totalSize := 0
+	for totalSize < len {
+		if i >= index {
+			return slc[:totalSize]
+		}
+
+		_, size := utf8.DecodeRune(slc[totalSize:])
+		totalSize += size
+		i++
+	}
+
+	return slc[:totalSize]
+}
+
 // RunePos returns the rune index of a given byte index
 // This could cause problems if the byte index is between code points
-func runePos(p int, str string) int {
+func runePos(p int, str []byte) int {
 	if p < 0 {
 		return 0
 	}
 	if p >= len(str) {
-		return utf8.RuneCountInString(str)
+		return utf8.RuneCount(str)
 	}
-	return utf8.RuneCountInString(str[:p])
+	return utf8.RuneCount(str[:p])
 }

 func combineLineMatch(src, dst LineMatch) LineMatch {
@@ -36,7 +70,7 @@ type State *region

 // LineStates is an interface for a buffer-like object which can also store the states and matches for every line
 type LineStates interface {
-	Line(n int) string
+	LineBytes(n int) []byte
 	LinesNum() int
 	State(lineN int) State
 	SetState(lineN int, s State)
@@ -60,7 +94,7 @@ func NewHighlighter(def *Def) *Highlighter {
 // color's group (represented as one byte)
 type LineMatch map[int]Group

-func findIndex(regex *regexp.Regexp, skip *regexp.Regexp, str []rune, canMatchStart, canMatchEnd bool) []int {
+func findIndex(regex *regexp.Regexp, skip *regexp.Regexp, str []byte, canMatchStart, canMatchEnd bool) []int {
 	regexStr := regex.String()
 	if strings.Contains(regexStr, "^") {
 		if !canMatchStart {
@@ -75,12 +109,12 @@ func findIndex(regex *regexp.Regexp, skip *regexp.Regexp, str []rune, canMatchSt

 	var strbytes []byte
 	if skip != nil {
-		strbytes = skip.ReplaceAllFunc([]byte(string(str)), func(match []byte) []byte {
+		strbytes = skip.ReplaceAllFunc(str, func(match []byte) []byte {
 			res := make([]byte, utf8.RuneCount(match))
 			return res
 		})
 	} else {
-		strbytes = []byte(string(str))
+		strbytes = str
 	}

 	match := regex.FindIndex(strbytes)
@@ -88,10 +122,10 @@ func findIndex(regex *regexp.Regexp, skip *regexp.Regexp, str []rune, canMatchSt
 		return nil
 	}
 	// return []int{match.Index, match.Index + match.Length}
-	return []int{runePos(match[0], string(str)), runePos(match[1], string(str))}
+	return []int{runePos(match[0], str), runePos(match[1], str)}
 }

-func findAllIndex(regex *regexp.Regexp, str []rune, canMatchStart, canMatchEnd bool) [][]int {
+func findAllIndex(regex *regexp.Regexp, str []byte, canMatchStart, canMatchEnd bool) [][]int {
 	regexStr := regex.String()
 	if strings.Contains(regexStr, "^") {
 		if !canMatchStart {
@@ -103,17 +137,16 @@ func findAllIndex(regex *regexp.Regexp, str []rune, canMatchStart, canMatchEnd b
 			return nil
 		}
 	}
-	matches := regex.FindAllIndex([]byte(string(str)), -1)
+	matches := regex.FindAllIndex(str, -1)
 	for i, m := range matches {
-		matches[i][0] = runePos(m[0], string(str))
-		matches[i][1] = runePos(m[1], string(str))
+		matches[i][0] = runePos(m[0], str)
+		matches[i][1] = runePos(m[1], str)
 	}
 	return matches
 }

-func (h *Highlighter) highlightRegion(highlights LineMatch, start int, canMatchEnd bool, lineNum int, line []rune, curRegion *region, statesOnly bool) LineMatch {
-	// highlights := make(LineMatch)
-
+func (h *Highlighter) highlightRegion(highlights LineMatch, start int, canMatchEnd bool, lineNum int, line []byte, curRegion *region, statesOnly bool) LineMatch {
+	lineLen := utf8.RuneCount(line)
 	if start == 0 {
 		if !statesOnly {
 			if _, ok := highlights[0]; !ok {
@@ -130,20 +163,20 @@ func (h *Highlighter) highlightRegion(highlights LineMatch, start int, canMatchE
 		if curRegion.parent == nil {
 			if !statesOnly {
 				highlights[start+loc[1]] = 0
-				h.highlightRegion(highlights, start, false, lineNum, line[:loc[0]], curRegion, statesOnly)
+				h.highlightRegion(highlights, start, false, lineNum, sliceEnd(line, loc[0]), curRegion, statesOnly)
 			}
-			h.highlightEmptyRegion(highlights, start+loc[1], canMatchEnd, lineNum, line[loc[1]:], statesOnly)
+			h.highlightEmptyRegion(highlights, start+loc[1], canMatchEnd, lineNum, sliceStart(line, loc[1]), statesOnly)
 			return highlights
 		}
 		if !statesOnly {
 			highlights[start+loc[1]] = curRegion.parent.group
-			h.highlightRegion(highlights, start, false, lineNum, line[:loc[0]], curRegion, statesOnly)
+			h.highlightRegion(highlights, start, false, lineNum, sliceEnd(line, loc[0]), curRegion, statesOnly)
 		}
-		h.highlightRegion(highlights, start+loc[1], canMatchEnd, lineNum, line[loc[1]:], curRegion.parent, statesOnly)
+		h.highlightRegion(highlights, start+loc[1], canMatchEnd, lineNum, sliceStart(line, loc[1]), curRegion.parent, statesOnly)
 		return highlights
 	}

-	if len(line) == 0 || statesOnly {
+	if lineLen == 0 || statesOnly {
 		if canMatchEnd {
 			h.lastRegion = curRegion
 		}
@@ -151,7 +184,7 @@ func (h *Highlighter) highlightRegion(highlights LineMatch, start int, canMatchE
 		return highlights
 	}

-	firstLoc := []int{len(line), 0}
+	firstLoc := []int{lineLen, 0}

 	var firstRegion *region
 	for _, r := range curRegion.rules.regions {
@@ -163,14 +196,14 @@ func (h *Highlighter) highlightRegion(highlights LineMatch, start int, canMatchE
 			}
 		}
 	}
-	if firstLoc[0] != len(line) {
+	if firstLoc[0] != lineLen {
 		highlights[start+firstLoc[0]] = firstRegion.limitGroup
-		h.highlightRegion(highlights, start, false, lineNum, line[:firstLoc[0]], curRegion, statesOnly)
-		h.highlightRegion(highlights, start+firstLoc[1], canMatchEnd, lineNum, line[firstLoc[1]:], firstRegion, statesOnly)
+		h.highlightRegion(highlights, start, false, lineNum, sliceEnd(line, firstLoc[0]), curRegion, statesOnly)
+		h.highlightRegion(highlights, start+firstLoc[1], canMatchEnd, lineNum, sliceStart(line, firstLoc[1]), firstRegion, statesOnly)
 		return highlights
 	}

-	fullHighlights := make([]Group, len([]rune(string(line))))
+	fullHighlights := make([]Group, lineLen)
 	for i := 0; i < len(fullHighlights); i++ {
 		fullHighlights[i] = curRegion.group
 	}
@@ -185,9 +218,7 @@ func (h *Highlighter) highlightRegion(highlights LineMatch, start int, canMatchE
 	}
 	for i, h := range fullHighlights {
 		if i == 0 || h != fullHighlights[i-1] {
-			// if _, ok := highlights[start+i]; !ok {
 			highlights[start+i] = h
-			// }
 		}
 	}

@@ -198,15 +229,16 @@ func (h *Highlighter) highlightRegion(highlights LineMatch, start int, canMatchE
 	return highlights
 }

-func (h *Highlighter) highlightEmptyRegion(highlights LineMatch, start int, canMatchEnd bool, lineNum int, line []rune, statesOnly bool) LineMatch {
-	if len(line) == 0 {
+func (h *Highlighter) highlightEmptyRegion(highlights LineMatch, start int, canMatchEnd bool, lineNum int, line []byte, statesOnly bool) LineMatch {
+	lineLen := utf8.RuneCount(line)
+	if lineLen == 0 {
 		if canMatchEnd {
 			h.lastRegion = nil
 		}
 		return highlights
 	}

-	firstLoc := []int{len(line), 0}
+	firstLoc := []int{lineLen, 0}
 	var firstRegion *region
 	for _, r := range h.Def.rules.regions {
 		loc := findIndex(r.start, nil, line, start == 0, canMatchEnd)
@@ -217,12 +249,12 @@ func (h *Highlighter) highlightEmptyRegion(highlights LineMatch, start int, canM
 			}
 		}
 	}
-	if firstLoc[0] != len(line) {
+	if firstLoc[0] != lineLen {
 		if !statesOnly {
 			highlights[start+firstLoc[0]] = firstRegion.limitGroup
 		}
-		h.highlightEmptyRegion(highlights, start, false, lineNum, line[:firstLoc[0]], statesOnly)
-		h.highlightRegion(highlights, start+firstLoc[1], canMatchEnd, lineNum, line[firstLoc[1]:], firstRegion, statesOnly)
+		h.highlightEmptyRegion(highlights, start, false, lineNum, sliceEnd(line, firstLoc[0]), statesOnly)
+		h.highlightRegion(highlights, start+firstLoc[1], canMatchEnd, lineNum, sliceStart(line, firstLoc[1]), firstRegion, statesOnly)
 		return highlights
 	}

@@ -267,7 +299,7 @@ func (h *Highlighter) HighlightString(input string) []LineMatch {
 	var lineMatches []LineMatch

 	for i := 0; i < len(lines); i++ {
-		line := []rune(lines[i])
+		line := []byte(lines[i])
 		highlights := make(LineMatch)

 		if i == 0 || h.lastRegion == nil {
@@ -283,7 +315,7 @@ func (h *Highlighter) HighlightString(input string) []LineMatch {
 // HighlightStates correctly sets all states for the buffer
 func (h *Highlighter) HighlightStates(input LineStates) {
 	for i := 0; i < input.LinesNum(); i++ {
-		line := []rune(input.Line(i))
+		line := input.LineBytes(i)
 		// highlights := make(LineMatch)

 		if i == 0 || h.lastRegion == nil {
@@ -307,7 +339,7 @@ func (h *Highlighter) HighlightMatches(input LineStates, startline, endline int)
 			break
 		}

-		line := []rune(input.Line(i))
+		line := input.LineBytes(i)
 		highlights := make(LineMatch)

 		var match LineMatch
@@ -331,7 +363,7 @@ func (h *Highlighter) ReHighlightStates(input LineStates, startline int) {
 		h.lastRegion = input.State(startline - 1)
 	}
 	for i := startline; i < input.LinesNum(); i++ {
-		line := []rune(input.Line(i))
+		line := input.LineBytes(i)
 		// highlights := make(LineMatch)

 		// var match LineMatch
@@ -353,7 +385,7 @@ func (h *Highlighter) ReHighlightStates(input LineStates, startline int) {

 // ReHighlightLine will rehighlight the state and match for a single line
 func (h *Highlighter) ReHighlightLine(input LineStates, lineN int) {
-	line := []rune(input.Line(lineN))
+	line := input.LineBytes(lineN)
 	highlights := make(LineMatch)

 	h.lastRegion = nil
--- a/cmd/micro/lineArray.go
+++ b/cmd/micro/lineArray.go
@@ -89,7 +89,6 @@ func NewLineArray(size int64, reader io.Reader) *LineArray {
 		if n >= 1000 && loaded >= 0 {
 			totalLinesNum := int(float64(size) * (float64(n) / float64(loaded)))
 			newSlice := make([]Line, len(la.lines), totalLinesNum+10000)
-			// The copy function is predeclared and works for any slice type.
 			copy(newSlice, la.lines)
 			la.lines = newSlice
 			loaded = -1
@@ -147,9 +146,9 @@ func (la *LineArray) SaveString(useCrlf bool) string {

 // NewlineBelow adds a newline below the given line number
 func (la *LineArray) NewlineBelow(y int) {
-	la.lines = append(la.lines, Line{[]byte(" "), nil, nil, false})
+	la.lines = append(la.lines, Line{[]byte{' '}, nil, nil, false})
 	copy(la.lines[y+2:], la.lines[y+1:])
-	la.lines[y+1] = Line{[]byte(""), la.lines[y].state, nil, false}
+	la.lines[y+1] = Line{[]byte{}, la.lines[y].state, nil, false}
 }

 // inserts a byte array at a given location
--- a/cmd/micro/messenger.go
+++ b/cmd/micro/messenger.go
@@ -261,6 +261,11 @@ func (m *Messenger) Prompt(prompt, placeholder, historyType string, completionTy
 		event := <-events

 		switch e := event.(type) {
+		case *tcell.EventResize:
+			for _, t := range tabs {
+				t.Resize()
+			}
+			RedrawAll()
 		case *tcell.EventKey:
 			switch e.Key() {
 			case tcell.KeyCtrlQ, tcell.KeyCtrlC, tcell.KeyEscape:
@@ -333,7 +338,7 @@ func (m *Messenger) Prompt(prompt, placeholder, historyType string, completionTy
 		m.HandleEvent(event, m.history[historyType])

 		m.Clear()
-		for _, v := range tabs[curTab].views {
+		for _, v := range tabs[curTab].Views {
 			v.Display()
 		}
 		DisplayTabs()
@@ -599,11 +604,11 @@ func (m *Messenger) Display() {
 func (m *Messenger) LoadHistory() {
 	if GetGlobalOption("savehistory").(bool) {
 		file, err := os.Open(configDir + "/buffers/history")
+		defer file.Close()
 		var decodedMap map[string][]string
 		if err == nil {
 			decoder := gob.NewDecoder(file)
 			err = decoder.Decode(&decodedMap)
-			file.Close()

 			if err != nil {
 				m.Error("Error loading history:", err)
@@ -633,6 +638,7 @@ func (m *Messenger) SaveHistory() {
 		}

 		file, err := os.Create(configDir + "/buffers/history")
+		defer file.Close()
 		if err == nil {
 			encoder := gob.NewEncoder(file)

@@ -641,7 +647,6 @@ func (m *Messenger) SaveHistory() {
 				m.Error("Error saving history:", err)
 				return
 			}
-			file.Close()
 		}
 	}
 }
--- a/cmd/micro/micro.go
+++ b/cmd/micro/micro.go
@@ -7,6 +7,7 @@ import (
 	"os"
 	"path/filepath"
 	"runtime"
+	"strings"
 	"time"

 	"github.com/go-errors/errors"
@@ -14,6 +15,7 @@ import (
 	"github.com/mitchellh/go-homedir"
 	"github.com/yuin/gopher-lua"
 	"github.com/zyedidia/clipboard"
+	"github.com/zyedidia/micro/cmd/micro/terminfo"
 	"github.com/zyedidia/tcell"
 	"github.com/zyedidia/tcell/encoding"
 	"layeh.com/gopher-luar"
@@ -57,11 +59,17 @@ var (

 	// Channel of jobs running in the background
 	jobs chan JobFunction
+
 	// Event channel
-	events     chan tcell.Event
-	autosave   chan bool
+	events   chan tcell.Event
+	autosave chan bool
+
+	// Channels for the terminal emulator
 	updateterm chan bool
 	closeterm  chan int
+
+	// How many redraws have happened
+	numRedraw uint
 )

 // LoadInput determines which files should be loaded into buffers
@@ -88,30 +96,23 @@ func LoadInput() []*Buffer {
 		// Option 1
 		// We go through each file and load it
 		for i := 0; i < len(args); i++ {
-			filename = args[i]
+			if strings.HasPrefix(args[i], "+") {
+				if strings.Contains(args[i], ":") {
+					split := strings.Split(args[i], ":")
+					*flagStartPos = split[0][1:] + "," + split[1]
+				} else {
+					*flagStartPos = args[i][1:] + ",0"
+				}
+				continue
+			}

-			// Check that the file exists
-			var input *os.File
-			if _, e := os.Stat(filename); e == nil {
-				// If it exists we load it into a buffer
-				input, err = os.Open(filename)
-				stat, _ := input.Stat()
-				defer input.Close()
-				if err != nil {
-					TermMessage(err)
-					continue
-				}
-				if stat.IsDir() {
-					TermMessage("Cannot read", filename, "because it is a directory")
-					continue
-				}
+			buf, err := NewBufferFromFile(args[i])
+			if err != nil {
+				TermMessage(err)
+				continue
 			}
 			// If the file didn't exist, input will be empty, and we'll open an empty buffer
-			if input != nil {
-				buffers = append(buffers, NewBuffer(input, FSize(input), filename))
-			} else {
-				buffers = append(buffers, NewBufferFromString("", filename))
-			}
+			buffers = append(buffers, buf)
 		}
 	} else if !isatty.IsTerminal(os.Stdin.Fd()) {
 		// Option 2
@@ -175,7 +176,20 @@ func InitConfigDir() {
 // InitScreen creates and initializes the tcell screen
 func InitScreen() {
 	// Should we enable true color?
-	truecolor := os.Getenv("MICRO_TRUECOLOR") == "1"
+	truecolor := false
+	colorterm := os.Getenv("COLORTERM")
+	if colorterm == "24bit" || colorterm == "truecolor" {
+		truecolor = true
+	}
+	microtc := os.Getenv("MICRO_TRUECOLOR")
+	if microtc == "1" {
+		truecolor = true
+	} else if microtc == "0" {
+		truecolor = false
+	}
+
+	tcelldb := os.Getenv("TCELLDB")
+	os.Setenv("TCELLDB", configDir+"/.tcelldb")

 	// In order to enable true color, we have to set the TERM to `xterm-truecolor` when
 	// initializing tcell, but after that, we can set the TERM back to whatever it was
@@ -188,12 +202,19 @@ func InitScreen() {
 	var err error
 	screen, err = tcell.NewScreen()
 	if err != nil {
-		fmt.Println(err)
 		if err == tcell.ErrTermNotFound {
-			fmt.Println("Micro does not recognize your terminal:", oldTerm)
-			fmt.Println("Please go to https://github.com/zyedidia/mkinfo to read about how to fix this problem (it should be easy to fix).")
+			terminfo.WriteDB(configDir + "/.tcelldb")
+			screen, err = tcell.NewScreen()
+			if err != nil {
+				fmt.Println(err)
+				fmt.Println("Fatal: Micro could not initialize a screen.")
+				os.Exit(1)
+			}
+		} else {
+			fmt.Println(err)
+			fmt.Println("Fatal: Micro could not initialize a screen.")
+			os.Exit(1)
 		}
-		os.Exit(1)
 	}
 	if err = screen.Init(); err != nil {
 		fmt.Println(err)
@@ -209,6 +230,8 @@ func InitScreen() {
 		screen.EnableMouse()
 	}

+	os.Setenv("TCELLDB", tcelldb)
+
 	// screen.SetStyle(defStyle)
 }

@@ -223,7 +246,7 @@ func RedrawAll() {
 		}
 	}

-	for _, v := range tabs[curTab].views {
+	for _, v := range tabs[curTab].Views {
 		v.Display()
 	}
 	DisplayTabs()
@@ -232,6 +255,11 @@ func RedrawAll() {
 		DisplayKeyMenu()
 	}
 	screen.Show()
+
+	if numRedraw%50 == 0 {
+		runtime.GC()
+	}
+	numRedraw++
 }

 func LoadAll() {
@@ -250,7 +278,7 @@ func LoadAll() {
 	InitColorscheme()

 	for _, tab := range tabs {
-		for _, v := range tab.views {
+		for _, v := range tab.Views {
 			v.Buf.UpdateRules()
 		}
 	}
@@ -268,7 +296,9 @@ func main() {
 		fmt.Println("-config-dir dir")
 		fmt.Println("    \tSpecify a custom location for the configuration directory")
 		fmt.Println("-startpos LINE,COL")
+		fmt.Println("+LINE:COL")
 		fmt.Println("    \tSpecify a line and column to start the cursor at when opening a buffer")
+		fmt.Println("    \tThis can also be done by opening file:LINE:COL")
 		fmt.Println("-options")
 		fmt.Println("    \tShow all option help")
 		fmt.Println("-version")
@@ -360,7 +390,7 @@ func main() {
 		tab.SetNum(len(tabs))
 		tabs = append(tabs, tab)
 		for _, t := range tabs {
-			for _, v := range t.views {
+			for _, v := range t.Views {
 				v.Center(false)
 			}

@@ -399,6 +429,7 @@ func main() {
 	L.SetGlobal("GetLeadingWhitespace", luar.New(L, GetLeadingWhitespace))
 	L.SetGlobal("MakeCompletion", luar.New(L, MakeCompletion))
 	L.SetGlobal("NewBuffer", luar.New(L, NewBufferFromString))
+	L.SetGlobal("NewBufferFromFile", luar.New(L, NewBufferFromFile))
 	L.SetGlobal("RuneStr", luar.New(L, func(r rune) string {
 		return string(r)
 	}))
@@ -438,7 +469,7 @@ func main() {
 	LoadPlugins()

 	for _, t := range tabs {
-		for _, v := range t.views {
+		for _, v := range t.Views {
 			GlobalPluginCall("onViewOpen", v)
 			GlobalPluginCall("onBufferOpen", v.Buf)
 		}
@@ -484,7 +515,7 @@ func main() {
 		case <-updateterm:
 			continue
 		case vnum := <-closeterm:
-			tabs[curTab].views[vnum].CloseTerminal()
+			tabs[curTab].Views[vnum].CloseTerminal()
 		case event = <-events:
 		}

@@ -514,7 +545,7 @@ func main() {
 						if CurView().mouseReleased {
 							// We loop through each view in the current tab and make sure the current view
 							// is the one being clicked in
-							for _, v := range tabs[curTab].views {
+							for _, v := range tabs[curTab].Views {
 								if x >= v.x && x < v.x+v.Width && y >= v.y && y < v.y+v.Height {
 									tabs[curTab].CurView = v.Num
 								}
@@ -523,9 +554,9 @@ func main() {
 					} else if e.Buttons() == tcell.WheelUp || e.Buttons() == tcell.WheelDown {
 						var view *View
 						x, y := e.Position()
-						for _, v := range tabs[curTab].views {
+						for _, v := range tabs[curTab].Views {
 							if x >= v.x && x < v.x+v.Width && y >= v.y && y < v.y+v.Height {
-								view = tabs[curTab].views[v.Num]
+								view = tabs[curTab].Views[v.Num]
 							}
 						}
 						if view != nil {
--- a/cmd/micro/pluginmanager.go
+++ b/cmd/micro/pluginmanager.go
@@ -541,7 +541,7 @@ func (pv PluginVersions) install() {
 			shouldInstall := true
 			if pv := currentlyInstalled.find(sel.pack.Name); pv != nil {
 				if pv.Version.NE(sel.Version) {
-					messenger.AddLog(fmt.Sprint("Uninstalling %q", sel.pack.Name))
+					messenger.AddLog("Uninstalling", sel.pack.Name)
 					UninstallPlugin(sel.pack.Name)
 				} else {
 					shouldInstall = false
--- a/cmd/micro/pluginmanager_test.go
+++ b/cmd/micro/pluginmanager_test.go
@@ -36,7 +36,7 @@ func TestDependencyResolving(t *testing.T) {
 		if v == nil {
 			t.Errorf("Failed to resolve %s", name)
 		} else if expected.NE(v.Version) {
-			t.Errorf("%s resolved in wrong version got %s", name, v)
+			t.Errorf("%s resolved in wrong version %v", name, v)
 		}
 	}

--- a/cmd/micro/runtime.go
+++ b/cmd/micro/runtime.go
--- a/cmd/micro/settings.go
+++ b/cmd/micro/settings.go
@@ -209,12 +209,14 @@ func DefaultGlobalSettings() map[string]interface{} {
 		"eofnewline":     false,
 		"fastdirty":      true,
 		"fileformat":     "unix",
+		"hidehelp":       false,
 		"ignorecase":     false,
 		"indentchar":     " ",
 		"infobar":        true,
 		"keepautoindent": false,
 		"keymenu":        false,
 		"matchbrace":     false,
+		"matchbraceleft": false,
 		"mouse":          true,
 		"pluginchannels": []string{"https://raw.githubusercontent.com/micro-editor/plugin-channel/master/channel.json"},
 		"pluginrepos":    []string{},
@@ -253,10 +255,12 @@ func DefaultLocalSettings() map[string]interface{} {
 		"fastdirty":      true,
 		"fileformat":     "unix",
 		"filetype":       "Unknown",
+		"hidehelp":       false,
 		"ignorecase":     false,
 		"indentchar":     " ",
 		"keepautoindent": false,
 		"matchbrace":     false,
+		"matchbraceleft": false,
 		"rmtrailingws":   false,
 		"ruler":          true,
 		"savecursor":     false,
@@ -320,7 +324,7 @@ func SetOption(option, value string) error {
 		// LoadSyntaxFiles()
 		InitColorscheme()
 		for _, tab := range tabs {
-			for _, view := range tab.views {
+			for _, view := range tab.Views {
 				view.Buf.UpdateRules()
 			}
 		}
@@ -343,7 +347,7 @@ func SetOption(option, value string) error {
 	if len(tabs) != 0 {
 		if _, ok := CurView().Buf.Settings[option]; ok {
 			for _, tab := range tabs {
-				for _, view := range tab.views {
+				for _, view := range tab.Views {
 					SetLocalOption(option, value, view)
 				}
 			}
@@ -389,7 +393,7 @@ func SetLocalOption(option, value string, view *View) error {
 		// If it is being turned off, we have to hash every open buffer
 		var empty [16]byte
 		for _, tab := range tabs {
-			for _, v := range tab.views {
+			for _, v := range tab.Views {
 				if !nativeValue.(bool) {
 					if v.Buf.origHash == empty {
 						data, err := ioutil.ReadFile(v.Buf.AbsPath)
@@ -425,7 +429,9 @@ func SetLocalOption(option, value string, view *View) error {
 		if !nativeValue.(bool) {
 			buf.ClearMatches()
 		} else {
-			buf.highlighter.HighlightStates(buf)
+			if buf.highlighter != nil {
+				buf.highlighter.HighlightStates(buf)
+			}
 		}
 	}

--- a/cmd/micro/split_tree.go
+++ b/cmd/micro/split_tree.go
@@ -70,9 +70,9 @@ func (l *LeafNode) VSplit(buf *Buffer, splitIndex int) {
 		copy(l.parent.children[splitIndex+1:], l.parent.children[splitIndex:])
 		l.parent.children[splitIndex] = NewLeafNode(newView, l.parent)

-		tab.views = append(tab.views, nil)
-		copy(tab.views[splitIndex+1:], tab.views[splitIndex:])
-		tab.views[splitIndex] = newView
+		tab.Views = append(tab.Views, nil)
+		copy(tab.Views[splitIndex+1:], tab.Views[splitIndex:])
+		tab.Views[splitIndex] = newView

 		tab.CurView = splitIndex
 	} else {
@@ -94,9 +94,9 @@ func (l *LeafNode) VSplit(buf *Buffer, splitIndex int) {
 		l.parent.children[search(l.parent.children, l)] = s
 		l.parent = s

-		tab.views = append(tab.views, nil)
-		copy(tab.views[splitIndex+1:], tab.views[splitIndex:])
-		tab.views[splitIndex] = newView
+		tab.Views = append(tab.Views, nil)
+		copy(tab.Views[splitIndex+1:], tab.Views[splitIndex:])
+		tab.Views[splitIndex] = newView

 		tab.CurView = splitIndex
 	}
@@ -123,9 +123,9 @@ func (l *LeafNode) HSplit(buf *Buffer, splitIndex int) {
 		copy(l.parent.children[splitIndex+1:], l.parent.children[splitIndex:])
 		l.parent.children[splitIndex] = NewLeafNode(newView, l.parent)

-		tab.views = append(tab.views, nil)
-		copy(tab.views[splitIndex+1:], tab.views[splitIndex:])
-		tab.views[splitIndex] = newView
+		tab.Views = append(tab.Views, nil)
+		copy(tab.Views[splitIndex+1:], tab.Views[splitIndex:])
+		tab.Views[splitIndex] = newView

 		tab.CurView = splitIndex
 	} else {
@@ -139,7 +139,7 @@ func (l *LeafNode) HSplit(buf *Buffer, splitIndex int) {
 		s.parent = l.parent
 		newView := NewView(buf)
 		newView.TabNum = l.parent.tabNum
-		newView.Num = len(tab.views)
+		newView.Num = len(tab.Views)
 		if splitIndex == 1 {
 			s.children = []Node{l, NewLeafNode(newView, s)}
 		} else {
@@ -148,9 +148,9 @@ func (l *LeafNode) HSplit(buf *Buffer, splitIndex int) {
 		l.parent.children[search(l.parent.children, l)] = s
 		l.parent = s

-		tab.views = append(tab.views, nil)
-		copy(tab.views[splitIndex+1:], tab.views[splitIndex:])
-		tab.views[splitIndex] = newView
+		tab.Views = append(tab.Views, nil)
+		copy(tab.Views[splitIndex+1:], tab.Views[splitIndex:])
+		tab.Views[splitIndex] = newView

 		tab.CurView = splitIndex
 	}
@@ -167,12 +167,12 @@ func (l *LeafNode) Delete() {
 	l.parent.children = l.parent.children[:len(l.parent.children)-1]

 	tab := tabs[l.parent.tabNum]
-	j := findView(tab.views, l.view)
-	copy(tab.views[j:], tab.views[j+1:])
-	tab.views[len(tab.views)-1] = nil // or the zero value of T
-	tab.views = tab.views[:len(tab.views)-1]
+	j := findView(tab.Views, l.view)
+	copy(tab.Views[j:], tab.Views[j+1:])
+	tab.Views[len(tab.Views)-1] = nil // or the zero value of T
+	tab.Views = tab.Views[:len(tab.Views)-1]

-	for i, v := range tab.views {
+	for i, v := range tab.Views {
 		v.Num = i
 	}
 	if tab.CurView > 0 {
--- a/cmd/micro/statusline.go
+++ b/cmd/micro/statusline.go
@@ -47,24 +47,26 @@ func (sline *Statusline) Display() {
 	file += " " + sline.view.Buf.Settings["fileformat"].(string)

 	rightText := ""
-	if len(kmenuBinding) > 0 {
-		if globalSettings["keymenu"].(bool) {
-			rightText += kmenuBinding + ": hide bindings"
-		} else {
-			rightText += kmenuBinding + ": show bindings"
-		}
-	}
-	if len(helpBinding) > 0 {
+	if !sline.view.Buf.Settings["hidehelp"].(bool) {
 		if len(kmenuBinding) > 0 {
-			rightText += ", "
+			if globalSettings["keymenu"].(bool) {
+				rightText += kmenuBinding + ": hide bindings"
+			} else {
+				rightText += kmenuBinding + ": show bindings"
+			}
 		}
-		if sline.view.Type == vtHelp {
-			rightText += helpBinding + ": close help"
-		} else {
-			rightText += helpBinding + ": open help"
+		if len(helpBinding) > 0 {
+			if len(kmenuBinding) > 0 {
+				rightText += ", "
+			}
+			if sline.view.Type == vtHelp {
+				rightText += helpBinding + ": close help"
+			} else {
+				rightText += helpBinding + ": open help"
+			}
 		}
+		rightText += " "
 	}
-	rightText += " "

 	statusLineStyle := defStyle.Reverse(true)
 	if style, ok := colorscheme["statusline"]; ok {
--- a/cmd/micro/tab.go
+++ b/cmd/micro/tab.go
@@ -14,7 +14,7 @@ type Tab struct {
 	// This contains all the views in this tab
 	// There is generally only one view per tab, but you can have
 	// multiple views with splits
-	views []*View
+	Views []*View
 	// This is the current view for this tab
 	CurView int

@@ -24,12 +24,12 @@ type Tab struct {
 // NewTabFromView creates a new tab and puts the given view in the tab
 func NewTabFromView(v *View) *Tab {
 	t := new(Tab)
-	t.views = append(t.views, v)
-	t.views[0].Num = 0
+	t.Views = append(t.Views, v)
+	t.Views[0].Num = 0

 	t.tree = new(SplitTree)
 	t.tree.kind = VerticalSplit
-	t.tree.children = []Node{NewLeafNode(t.views[0], t.tree)}
+	t.tree.children = []Node{NewLeafNode(t.Views[0], t.tree)}

 	w, h := screen.Size()
 	t.tree.width = w
@@ -50,7 +50,7 @@ func NewTabFromView(v *View) *Tab {
 // SetNum sets all this tab's views to have the correct tab number
 func (t *Tab) SetNum(num int) {
 	t.tree.tabNum = num
-	for _, v := range t.views {
+	for _, v := range t.Views {
 		v.TabNum = num
 	}
 }
@@ -76,7 +76,7 @@ func (t *Tab) Resize() {

 	t.tree.ResizeSplits()

-	for i, v := range t.views {
+	for i, v := range t.Views {
 		v.Num = i
 		if v.Type == vtTerm {
 			v.term.Resize(v.Width, v.Height)
@@ -87,7 +87,7 @@ func (t *Tab) Resize() {
 // CurView returns the current view
 func CurView() *View {
 	curTab := tabs[curTab]
-	return curTab.views[curTab.CurView]
+	return curTab.Views[curTab.CurView]
 }

 // TabbarString returns the string that should be displayed in the tabbar
@@ -103,7 +103,7 @@ func TabbarString() (string, map[int]int) {
 		} else {
 			str += " "
 		}
-		buf := t.views[t.CurView].Buf
+		buf := t.Views[t.CurView].Buf
 		str += buf.GetName()
 		if buf.Modified() {
 			str += " +"
--- a/cmd/micro/terminfo/LICENSE.md
+++ b/cmd/micro/terminfo/LICENSE.md
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
--- a/cmd/micro/terminfo/README.md
+++ b/cmd/micro/terminfo/README.md
@@ -0,0 +1,6 @@
+# Terminfo parser
+
+This terminfo parser was written by the authors of [tcell](https://github.com/gdamore/tcell). We are using it here
+to compile the terminal database if the terminal entry is not found in set of precompiled terminals.
+
+The source for `mkinfo.go` is adapted from tcell's `mkinfo` tool to be more of a library.
--- a/cmd/micro/terminfo/mkinfo.go
+++ b/cmd/micro/terminfo/mkinfo.go
@@ -0,0 +1,512 @@
+// Copyright 2017 The TCell Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use file except in compliance with the License.
+// You may obtain a copy of the license at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// This command is used to generate suitable configuration files in either
+// go syntax or in JSON.  It defaults to JSON output on stdout.  If no
+// term values are specified on the command line, then $TERM is used.
+//
+// Usage is like this:
+//
+// mkinfo [-init] [-go file.go] [-json file.json] [-quiet] [-nofatal] [<term>...]
+//
+// -gzip     specifies output should be compressed (json only)
+// -go       specifies Go output into the named file.  Use - for stdout.
+// -json     specifies JSON output in the named file.  Use - for stdout
+// -nofatal  indicates that errors loading definitions should not be fatal
+//
+
+package terminfo
+
+import (
+	"bytes"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"os"
+	"os/exec"
+	"regexp"
+	"strconv"
+	"strings"
+)
+
+type termcap struct {
+	name    string
+	desc    string
+	aliases []string
+	bools   map[string]bool
+	nums    map[string]int
+	strs    map[string]string
+}
+
+func (tc *termcap) getnum(s string) int {
+	return (tc.nums[s])
+}
+
+func (tc *termcap) getflag(s string) bool {
+	return (tc.bools[s])
+}
+
+func (tc *termcap) getstr(s string) string {
+	return (tc.strs[s])
+}
+
+const (
+	NONE = iota
+	CTRL
+	ESC
+)
+
+func unescape(s string) string {
+	// Various escapes are in \x format.  Control codes are
+	// encoded as ^M (carat followed by ASCII equivalent).
+	// Escapes are: \e, \E - escape
+	//  \0 NULL, \n \l \r \t \b \f \s for equivalent C escape.
+	buf := &bytes.Buffer{}
+	esc := NONE
+
+	for i := 0; i < len(s); i++ {
+		c := s[i]
+		switch esc {
+		case NONE:
+			switch c {
+			case '\\':
+				esc = ESC
+			case '^':
+				esc = CTRL
+			default:
+				buf.WriteByte(c)
+			}
+		case CTRL:
+			buf.WriteByte(c - 0x40)
+			esc = NONE
+		case ESC:
+			switch c {
+			case 'E', 'e':
+				buf.WriteByte(0x1b)
+			case '0', '1', '2', '3', '4', '5', '6', '7':
+				if i+2 < len(s) && s[i+1] >= '0' && s[i+1] <= '7' && s[i+2] >= '0' && s[i+2] <= '7' {
+					buf.WriteByte(((c - '0') * 64) + ((s[i+1] - '0') * 8) + (s[i+2] - '0'))
+					i = i + 2
+				} else if c == '0' {
+					buf.WriteByte(0)
+				}
+			case 'n':
+				buf.WriteByte('\n')
+			case 'r':
+				buf.WriteByte('\r')
+			case 't':
+				buf.WriteByte('\t')
+			case 'b':
+				buf.WriteByte('\b')
+			case 'f':
+				buf.WriteByte('\f')
+			case 's':
+				buf.WriteByte(' ')
+			case 'l':
+				panic("WTF: weird format: " + s)
+			default:
+				buf.WriteByte(c)
+			}
+			esc = NONE
+		}
+	}
+	return (buf.String())
+}
+
+func (tc *termcap) setupterm(name string) error {
+	cmd := exec.Command("infocmp", "-1", name)
+	output := &bytes.Buffer{}
+	cmd.Stdout = output
+
+	tc.strs = make(map[string]string)
+	tc.bools = make(map[string]bool)
+	tc.nums = make(map[string]int)
+
+	err := cmd.Run()
+	if err != nil {
+		return err
+	}
+
+	// Now parse the output.
+	// We get comment lines (starting with "#"), followed by
+	// a header line that looks like "<name>|<alias>|...|<desc>"
+	// then capabilities, one per line, starting with a tab and ending
+	// with a comma and newline.
+	lines := strings.Split(output.String(), "\n")
+	for len(lines) > 0 && strings.HasPrefix(lines[0], "#") {
+		lines = lines[1:]
+	}
+
+	// Ditch trailing empty last line
+	if lines[len(lines)-1] == "" {
+		lines = lines[:len(lines)-1]
+	}
+	header := lines[0]
+	if strings.HasSuffix(header, ",") {
+		header = header[:len(header)-1]
+	}
+	names := strings.Split(header, "|")
+	tc.name = names[0]
+	names = names[1:]
+	if len(names) > 0 {
+		tc.desc = names[len(names)-1]
+		names = names[:len(names)-1]
+	}
+	tc.aliases = names
+	for _, val := range lines[1:] {
+		if (!strings.HasPrefix(val, "\t")) ||
+			(!strings.HasSuffix(val, ",")) {
+			return (errors.New("malformed infocmp: " + val))
+		}
+
+		val = val[1:]
+		val = val[:len(val)-1]
+
+		if k := strings.SplitN(val, "=", 2); len(k) == 2 {
+			tc.strs[k[0]] = unescape(k[1])
+		} else if k := strings.SplitN(val, "#", 2); len(k) == 2 {
+			if u, err := strconv.ParseUint(k[1], 10, 0); err != nil {
+				return (err)
+			} else {
+				tc.nums[k[0]] = int(u)
+			}
+		} else {
+			tc.bools[val] = true
+		}
+	}
+	return nil
+}
+
+// This program is used to collect data from the system's terminfo library,
+// and write it into Go source code.  That is, we maintain our terminfo
+// capabilities encoded in the program.  It should never need to be run by
+// an end user, but developers can use this to add codes for additional
+// terminal types.
+//
+// If a terminal name ending with -truecolor is given, and we cannot find
+// one, we will try to fabricate one from either the -256color (if present)
+// or the unadorned base name, adding the XTerm specific 24-bit color
+// escapes.  We believe that all 24-bit capable terminals use the same
+// escape sequences, and terminfo has yet to evolve to support this.
+func getinfo(name string) (*Terminfo, string, error) {
+	var tc termcap
+	addTrueColor := false
+	if err := tc.setupterm(name); err != nil {
+		if strings.HasSuffix(name, "-truecolor") {
+			base := name[:len(name)-len("-truecolor")]
+			// Probably -256color is closest to what we want
+			if err = tc.setupterm(base + "-256color"); err != nil {
+				err = tc.setupterm(base)
+			}
+			if err == nil {
+				addTrueColor = true
+			}
+			tc.name = name
+		}
+		if err != nil {
+			return nil, "", err
+		}
+	}
+	t := &Terminfo{}
+	// If this is an alias record, then just emit the alias
+	t.Name = tc.name
+	if t.Name != name {
+		return t, "", nil
+	}
+	t.Aliases = tc.aliases
+	t.Colors = tc.getnum("colors")
+	t.Columns = tc.getnum("cols")
+	t.Lines = tc.getnum("lines")
+	t.Bell = tc.getstr("bel")
+	t.Clear = tc.getstr("clear")
+	t.EnterCA = tc.getstr("smcup")
+	t.ExitCA = tc.getstr("rmcup")
+	t.ShowCursor = tc.getstr("cnorm")
+	t.HideCursor = tc.getstr("civis")
+	t.AttrOff = tc.getstr("sgr0")
+	t.Underline = tc.getstr("smul")
+	t.Bold = tc.getstr("bold")
+	t.Blink = tc.getstr("blink")
+	t.Dim = tc.getstr("dim")
+	t.Reverse = tc.getstr("rev")
+	t.EnterKeypad = tc.getstr("smkx")
+	t.ExitKeypad = tc.getstr("rmkx")
+	t.SetFg = tc.getstr("setaf")
+	t.SetBg = tc.getstr("setab")
+	t.SetCursor = tc.getstr("cup")
+	t.CursorBack1 = tc.getstr("cub1")
+	t.CursorUp1 = tc.getstr("cuu1")
+	t.KeyF1 = tc.getstr("kf1")
+	t.KeyF2 = tc.getstr("kf2")
+	t.KeyF3 = tc.getstr("kf3")
+	t.KeyF4 = tc.getstr("kf4")
+	t.KeyF5 = tc.getstr("kf5")
+	t.KeyF6 = tc.getstr("kf6")
+	t.KeyF7 = tc.getstr("kf7")
+	t.KeyF8 = tc.getstr("kf8")
+	t.KeyF9 = tc.getstr("kf9")
+	t.KeyF10 = tc.getstr("kf10")
+	t.KeyF11 = tc.getstr("kf11")
+	t.KeyF12 = tc.getstr("kf12")
+	t.KeyF13 = tc.getstr("kf13")
+	t.KeyF14 = tc.getstr("kf14")
+	t.KeyF15 = tc.getstr("kf15")
+	t.KeyF16 = tc.getstr("kf16")
+	t.KeyF17 = tc.getstr("kf17")
+	t.KeyF18 = tc.getstr("kf18")
+	t.KeyF19 = tc.getstr("kf19")
+	t.KeyF20 = tc.getstr("kf20")
+	t.KeyF21 = tc.getstr("kf21")
+	t.KeyF22 = tc.getstr("kf22")
+	t.KeyF23 = tc.getstr("kf23")
+	t.KeyF24 = tc.getstr("kf24")
+	t.KeyF25 = tc.getstr("kf25")
+	t.KeyF26 = tc.getstr("kf26")
+	t.KeyF27 = tc.getstr("kf27")
+	t.KeyF28 = tc.getstr("kf28")
+	t.KeyF29 = tc.getstr("kf29")
+	t.KeyF30 = tc.getstr("kf30")
+	t.KeyF31 = tc.getstr("kf31")
+	t.KeyF32 = tc.getstr("kf32")
+	t.KeyF33 = tc.getstr("kf33")
+	t.KeyF34 = tc.getstr("kf34")
+	t.KeyF35 = tc.getstr("kf35")
+	t.KeyF36 = tc.getstr("kf36")
+	t.KeyF37 = tc.getstr("kf37")
+	t.KeyF38 = tc.getstr("kf38")
+	t.KeyF39 = tc.getstr("kf39")
+	t.KeyF40 = tc.getstr("kf40")
+	t.KeyF41 = tc.getstr("kf41")
+	t.KeyF42 = tc.getstr("kf42")
+	t.KeyF43 = tc.getstr("kf43")
+	t.KeyF44 = tc.getstr("kf44")
+	t.KeyF45 = tc.getstr("kf45")
+	t.KeyF46 = tc.getstr("kf46")
+	t.KeyF47 = tc.getstr("kf47")
+	t.KeyF48 = tc.getstr("kf48")
+	t.KeyF49 = tc.getstr("kf49")
+	t.KeyF50 = tc.getstr("kf50")
+	t.KeyF51 = tc.getstr("kf51")
+	t.KeyF52 = tc.getstr("kf52")
+	t.KeyF53 = tc.getstr("kf53")
+	t.KeyF54 = tc.getstr("kf54")
+	t.KeyF55 = tc.getstr("kf55")
+	t.KeyF56 = tc.getstr("kf56")
+	t.KeyF57 = tc.getstr("kf57")
+	t.KeyF58 = tc.getstr("kf58")
+	t.KeyF59 = tc.getstr("kf59")
+	t.KeyF60 = tc.getstr("kf60")
+	t.KeyF61 = tc.getstr("kf61")
+	t.KeyF62 = tc.getstr("kf62")
+	t.KeyF63 = tc.getstr("kf63")
+	t.KeyF64 = tc.getstr("kf64")
+	t.KeyInsert = tc.getstr("kich1")
+	t.KeyDelete = tc.getstr("kdch1")
+	t.KeyBackspace = tc.getstr("kbs")
+	t.KeyHome = tc.getstr("khome")
+	t.KeyEnd = tc.getstr("kend")
+	t.KeyUp = tc.getstr("kcuu1")
+	t.KeyDown = tc.getstr("kcud1")
+	t.KeyRight = tc.getstr("kcuf1")
+	t.KeyLeft = tc.getstr("kcub1")
+	t.KeyPgDn = tc.getstr("knp")
+	t.KeyPgUp = tc.getstr("kpp")
+	t.KeyBacktab = tc.getstr("kcbt")
+	t.KeyExit = tc.getstr("kext")
+	t.KeyCancel = tc.getstr("kcan")
+	t.KeyPrint = tc.getstr("kprt")
+	t.KeyHelp = tc.getstr("khlp")
+	t.KeyClear = tc.getstr("kclr")
+	t.AltChars = tc.getstr("acsc")
+	t.EnterAcs = tc.getstr("smacs")
+	t.ExitAcs = tc.getstr("rmacs")
+	t.EnableAcs = tc.getstr("enacs")
+	t.Mouse = tc.getstr("kmous")
+	t.KeyShfRight = tc.getstr("kRIT")
+	t.KeyShfLeft = tc.getstr("kLFT")
+	t.KeyShfHome = tc.getstr("kHOM")
+	t.KeyShfEnd = tc.getstr("kEND")
+
+	// Terminfo lacks descriptions for a bunch of modified keys,
+	// but modern XTerm and emulators often have them.  Let's add them,
+	// if the shifted right and left arrows are defined.
+	if t.KeyShfRight == "\x1b[1;2C" && t.KeyShfLeft == "\x1b[1;2D" {
+		t.KeyShfUp = "\x1b[1;2A"
+		t.KeyShfDown = "\x1b[1;2B"
+		t.KeyMetaUp = "\x1b[1;9A"
+		t.KeyMetaDown = "\x1b[1;9B"
+		t.KeyMetaRight = "\x1b[1;9C"
+		t.KeyMetaLeft = "\x1b[1;9D"
+		t.KeyAltUp = "\x1b[1;3A"
+		t.KeyAltDown = "\x1b[1;3B"
+		t.KeyAltRight = "\x1b[1;3C"
+		t.KeyAltLeft = "\x1b[1;3D"
+		t.KeyCtrlUp = "\x1b[1;5A"
+		t.KeyCtrlDown = "\x1b[1;5B"
+		t.KeyCtrlRight = "\x1b[1;5C"
+		t.KeyCtrlLeft = "\x1b[1;5D"
+		t.KeyAltShfUp = "\x1b[1;4A"
+		t.KeyAltShfDown = "\x1b[1;4B"
+		t.KeyAltShfRight = "\x1b[1;4C"
+		t.KeyAltShfLeft = "\x1b[1;4D"
+
+		t.KeyMetaShfUp = "\x1b[1;10A"
+		t.KeyMetaShfDown = "\x1b[1;10B"
+		t.KeyMetaShfRight = "\x1b[1;10C"
+		t.KeyMetaShfLeft = "\x1b[1;10D"
+
+		t.KeyCtrlShfUp = "\x1b[1;6A"
+		t.KeyCtrlShfDown = "\x1b[1;6B"
+		t.KeyCtrlShfRight = "\x1b[1;6C"
+		t.KeyCtrlShfLeft = "\x1b[1;6D"
+	}
+	// And also for Home and End
+	if t.KeyShfHome == "\x1b[1;2H" && t.KeyShfEnd == "\x1b[1;2F" {
+		t.KeyCtrlHome = "\x1b[1;5H"
+		t.KeyCtrlEnd = "\x1b[1;5F"
+		t.KeyAltHome = "\x1b[1;9H"
+		t.KeyAltEnd = "\x1b[1;9F"
+		t.KeyCtrlShfHome = "\x1b[1;6H"
+		t.KeyCtrlShfEnd = "\x1b[1;6F"
+		t.KeyAltShfHome = "\x1b[1;4H"
+		t.KeyAltShfEnd = "\x1b[1;4F"
+		t.KeyMetaShfHome = "\x1b[1;10H"
+		t.KeyMetaShfEnd = "\x1b[1;10F"
+	}
+
+	// And the same thing for rxvt and workalikes (Eterm, aterm, etc.)
+	// It seems that urxvt at least send ESC as ALT prefix for these,
+	// although some places seem to indicate a separate ALT key sesquence.
+	if t.KeyShfRight == "\x1b[c" && t.KeyShfLeft == "\x1b[d" {
+		t.KeyShfUp = "\x1b[a"
+		t.KeyShfDown = "\x1b[b"
+		t.KeyCtrlUp = "\x1b[Oa"
+		t.KeyCtrlDown = "\x1b[Ob"
+		t.KeyCtrlRight = "\x1b[Oc"
+		t.KeyCtrlLeft = "\x1b[Od"
+	}
+	if t.KeyShfHome == "\x1b[7$" && t.KeyShfEnd == "\x1b[8$" {
+		t.KeyCtrlHome = "\x1b[7^"
+		t.KeyCtrlEnd = "\x1b[8^"
+	}
+
+	// If the kmous entry is present, then we need to record the
+	// the codes to enter and exit mouse mode.  Sadly, this is not
+	// part of the terminfo databases anywhere that I've found, but
+	// is an extension.  The escape codes are documented in the XTerm
+	// manual, and all terminals that have kmous are expected to
+	// use these same codes, unless explicitly configured otherwise
+	// vi XM.  Note that in any event, we only known how to parse either
+	// x11 or SGR mouse events -- if your terminal doesn't support one
+	// of these two forms, you maybe out of luck.
+	t.MouseMode = tc.getstr("XM")
+	if t.Mouse != "" && t.MouseMode == "" {
+		// we anticipate that all xterm mouse tracking compatible
+		// terminals understand mouse tracking (1000), but we hope
+		// that those that don't understand any-event tracking (1003)
+		// will at least ignore it.  Likewise we hope that terminals
+		// that don't understand SGR reporting (1006) just ignore it.
+		t.MouseMode = "%?%p1%{1}%=%t%'h'%Pa%e%'l'%Pa%;" +
+			"\x1b[?1000%ga%c\x1b[?1002%ga%c\x1b[?1003%ga%c\x1b[?1006%ga%c"
+	}
+
+	// We only support colors in ANSI 8 or 256 color mode.
+	if t.Colors < 8 || t.SetFg == "" {
+		t.Colors = 0
+	}
+	if t.SetCursor == "" {
+		return nil, "", errors.New("terminal not cursor addressable")
+	}
+
+	// For padding, we lookup the pad char.  If that isn't present,
+	// and npc is *not* set, then we assume a null byte.
+	t.PadChar = tc.getstr("pad")
+	if t.PadChar == "" {
+		if !tc.getflag("npc") {
+			t.PadChar = "\u0000"
+		}
+	}
+
+	// For some terminals we fabricate a -truecolor entry, that may
+	// not exist in terminfo.
+	if addTrueColor {
+		t.SetFgRGB = "\x1b[38;2;%p1%d;%p2%d;%p3%dm"
+		t.SetBgRGB = "\x1b[48;2;%p1%d;%p2%d;%p3%dm"
+		t.SetFgBgRGB = "\x1b[38;2;%p1%d;%p2%d;%p3%d;" +
+			"48;2;%p4%d;%p5%d;%p6%dm"
+	}
+
+	// For terminals that use "standard" SGR sequences, lets combine the
+	// foreground and background together.
+	if strings.HasPrefix(t.SetFg, "\x1b[") &&
+		strings.HasPrefix(t.SetBg, "\x1b[") &&
+		strings.HasSuffix(t.SetFg, "m") &&
+		strings.HasSuffix(t.SetBg, "m") {
+		fg := t.SetFg[:len(t.SetFg)-1]
+		r := regexp.MustCompile("%p1")
+		bg := r.ReplaceAllString(t.SetBg[2:], "%p2")
+		t.SetFgBg = fg + ";" + bg
+	}
+
+	return t, tc.desc, nil
+}
+
+func WriteDB(filename string) error {
+	var e error
+	js := []byte{}
+	args := []string{os.Getenv("TERM")}
+
+	tdata := make(map[string]*Terminfo)
+	descs := make(map[string]string)
+
+	for _, term := range args {
+		if t, desc, e := getinfo(term); e != nil {
+			return e
+		} else {
+			tdata[term] = t
+			descs[term] = desc
+		}
+	}
+
+	if len(tdata) == 0 {
+		// No data.
+		return errors.New("No data")
+	}
+	o := os.Stdout
+	if o, e = os.Create(filename); e != nil {
+		return e
+	}
+	var w io.WriteCloser
+	w = o
+	for _, term := range args {
+		if t := tdata[term]; t != nil {
+			js, e = json.Marshal(t)
+			fmt.Fprintln(w, string(js))
+		}
+		// arguably if there is more than one term, this
+		// should be a javascript array, but that's not how
+		// we load it.  We marshal objects one at a time from
+		// the file.
+	}
+	if e != nil {
+		return e
+	}
+	w.Close()
+	if w != o {
+		o.Close()
+	}
+
+	return nil
+}
--- a/cmd/micro/terminfo/terminfo.go
+++ b/cmd/micro/terminfo/terminfo.go
@@ -0,0 +1,837 @@
+// Copyright 2017 The TCell Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use file except in compliance with the License.
+// You may obtain a copy of the license at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package terminfo
+
+import (
+	"bytes"
+	"compress/gzip"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"os"
+	"path"
+	"strconv"
+	"strings"
+	"sync"
+)
+
+var (
+	// ErrTermNotFound indicates that a suitable terminal entry could
+	// not be found.  This can result from either not having TERM set,
+	// or from the TERM failing to support certain minimal functionality,
+	// in particular absolute cursor addressability (the cup capability)
+	// is required.  For example, legacy "adm3" lacks this capability,
+	// whereas the slightly newer "adm3a" supports it.  This failure
+	// occurs most often with "dumb".
+	ErrTermNotFound = errors.New("terminal entry not found")
+)
+
+// Terminfo represents a terminfo entry.  Note that we use friendly names
+// in Go, but when we write out JSON, we use the same names as terminfo.
+// The name, aliases and smous, rmous fields do not come from terminfo directly.
+type Terminfo struct {
+	Name         string   `json:"name"`
+	Aliases      []string `json:"aliases,omitempty"`
+	Columns      int      `json:"cols,omitempty"`   // cols
+	Lines        int      `json:"lines,omitempty"`  // lines
+	Colors       int      `json:"colors,omitempty"` // colors
+	Bell         string   `json:"bell,omitempty"`   // bell
+	Clear        string   `json:"clear,omitempty"`  // clear
+	EnterCA      string   `json:"smcup,omitempty"`  // smcup
+	ExitCA       string   `json:"rmcup,omitempty"`  // rmcup
+	ShowCursor   string   `json:"cnorm,omitempty"`  // cnorm
+	HideCursor   string   `json:"civis,omitempty"`  // civis
+	AttrOff      string   `json:"sgr0,omitempty"`   // sgr0
+	Underline    string   `json:"smul,omitempty"`   // smul
+	Bold         string   `json:"bold,omitempty"`   // bold
+	Blink        string   `json:"blink,omitempty"`  // blink
+	Reverse      string   `json:"rev,omitempty"`    // rev
+	Dim          string   `json:"dim,omitempty"`    // dim
+	EnterKeypad  string   `json:"smkx,omitempty"`   // smkx
+	ExitKeypad   string   `json:"rmkx,omitempty"`   // rmkx
+	SetFg        string   `json:"setaf,omitempty"`  // setaf
+	SetBg        string   `json:"setbg,omitempty"`  // setab
+	SetCursor    string   `json:"cup,omitempty"`    // cup
+	CursorBack1  string   `json:"cub1,omitempty"`   // cub1
+	CursorUp1    string   `json:"cuu1,omitempty"`   // cuu1
+	PadChar      string   `json:"pad,omitempty"`    // pad
+	KeyBackspace string   `json:"kbs,omitempty"`    // kbs
+	KeyF1        string   `json:"kf1,omitempty"`    // kf1
+	KeyF2        string   `json:"kf2,omitempty"`    // kf2
+	KeyF3        string   `json:"kf3,omitempty"`    // kf3
+	KeyF4        string   `json:"kf4,omitempty"`    // kf4
+	KeyF5        string   `json:"kf5,omitempty"`    // kf5
+	KeyF6        string   `json:"kf6,omitempty"`    // kf6
+	KeyF7        string   `json:"kf7,omitempty"`    // kf7
+	KeyF8        string   `json:"kf8,omitempty"`    // kf8
+	KeyF9        string   `json:"kf9,omitempty"`    // kf9
+	KeyF10       string   `json:"kf10,omitempty"`   // kf10
+	KeyF11       string   `json:"kf11,omitempty"`   // kf11
+	KeyF12       string   `json:"kf12,omitempty"`   // kf12
+	KeyF13       string   `json:"kf13,omitempty"`   // kf13
+	KeyF14       string   `json:"kf14,omitempty"`   // kf14
+	KeyF15       string   `json:"kf15,omitempty"`   // kf15
+	KeyF16       string   `json:"kf16,omitempty"`   // kf16
+	KeyF17       string   `json:"kf17,omitempty"`   // kf17
+	KeyF18       string   `json:"kf18,omitempty"`   // kf18
+	KeyF19       string   `json:"kf19,omitempty"`   // kf19
+	KeyF20       string   `json:"kf20,omitempty"`   // kf20
+	KeyF21       string   `json:"kf21,omitempty"`   // kf21
+	KeyF22       string   `json:"kf22,omitempty"`   // kf22
+	KeyF23       string   `json:"kf23,omitempty"`   // kf23
+	KeyF24       string   `json:"kf24,omitempty"`   // kf24
+	KeyF25       string   `json:"kf25,omitempty"`   // kf25
+	KeyF26       string   `json:"kf26,omitempty"`   // kf26
+	KeyF27       string   `json:"kf27,omitempty"`   // kf27
+	KeyF28       string   `json:"kf28,omitempty"`   // kf28
+	KeyF29       string   `json:"kf29,omitempty"`   // kf29
+	KeyF30       string   `json:"kf30,omitempty"`   // kf30
+	KeyF31       string   `json:"kf31,omitempty"`   // kf31
+	KeyF32       string   `json:"kf32,omitempty"`   // kf32
+	KeyF33       string   `json:"kf33,omitempty"`   // kf33
+	KeyF34       string   `json:"kf34,omitempty"`   // kf34
+	KeyF35       string   `json:"kf35,omitempty"`   // kf35
+	KeyF36       string   `json:"kf36,omitempty"`   // kf36
+	KeyF37       string   `json:"kf37,omitempty"`   // kf37
+	KeyF38       string   `json:"kf38,omitempty"`   // kf38
+	KeyF39       string   `json:"kf39,omitempty"`   // kf39
+	KeyF40       string   `json:"kf40,omitempty"`   // kf40
+	KeyF41       string   `json:"kf41,omitempty"`   // kf41
+	KeyF42       string   `json:"kf42,omitempty"`   // kf42
+	KeyF43       string   `json:"kf43,omitempty"`   // kf43
+	KeyF44       string   `json:"kf44,omitempty"`   // kf44
+	KeyF45       string   `json:"kf45,omitempty"`   // kf45
+	KeyF46       string   `json:"kf46,omitempty"`   // kf46
+	KeyF47       string   `json:"kf47,omitempty"`   // kf47
+	KeyF48       string   `json:"kf48,omitempty"`   // kf48
+	KeyF49       string   `json:"kf49,omitempty"`   // kf49
+	KeyF50       string   `json:"kf50,omitempty"`   // kf50
+	KeyF51       string   `json:"kf51,omitempty"`   // kf51
+	KeyF52       string   `json:"kf52,omitempty"`   // kf52
+	KeyF53       string   `json:"kf53,omitempty"`   // kf53
+	KeyF54       string   `json:"kf54,omitempty"`   // kf54
+	KeyF55       string   `json:"kf55,omitempty"`   // kf55
+	KeyF56       string   `json:"kf56,omitempty"`   // kf56
+	KeyF57       string   `json:"kf57,omitempty"`   // kf57
+	KeyF58       string   `json:"kf58,omitempty"`   // kf58
+	KeyF59       string   `json:"kf59,omitempty"`   // kf59
+	KeyF60       string   `json:"kf60,omitempty"`   // kf60
+	KeyF61       string   `json:"kf61,omitempty"`   // kf61
+	KeyF62       string   `json:"kf62,omitempty"`   // kf62
+	KeyF63       string   `json:"kf63,omitempty"`   // kf63
+	KeyF64       string   `json:"kf64,omitempty"`   // kf64
+	KeyInsert    string   `json:"kich,omitempty"`   // kich1
+	KeyDelete    string   `json:"kdch,omitempty"`   // kdch1
+	KeyHome      string   `json:"khome,omitempty"`  // khome
+	KeyEnd       string   `json:"kend,omitempty"`   // kend
+	KeyHelp      string   `json:"khlp,omitempty"`   // khlp
+	KeyPgUp      string   `json:"kpp,omitempty"`    // kpp
+	KeyPgDn      string   `json:"knp,omitempty"`    // knp
+	KeyUp        string   `json:"kcuu1,omitempty"`  // kcuu1
+	KeyDown      string   `json:"kcud1,omitempty"`  // kcud1
+	KeyLeft      string   `json:"kcub1,omitempty"`  // kcub1
+	KeyRight     string   `json:"kcuf1,omitempty"`  // kcuf1
+	KeyBacktab   string   `json:"kcbt,omitempty"`   // kcbt
+	KeyExit      string   `json:"kext,omitempty"`   // kext
+	KeyClear     string   `json:"kclr,omitempty"`   // kclr
+	KeyPrint     string   `json:"kprt,omitempty"`   // kprt
+	KeyCancel    string   `json:"kcan,omitempty"`   // kcan
+	Mouse        string   `json:"kmous,omitempty"`  // kmous
+	MouseMode    string   `json:"XM,omitempty"`     // XM
+	AltChars     string   `json:"acsc,omitempty"`   // acsc
+	EnterAcs     string   `json:"smacs,omitempty"`  // smacs
+	ExitAcs      string   `json:"rmacs,omitempty"`  // rmacs
+	EnableAcs    string   `json:"enacs,omitempty"`  // enacs
+	KeyShfRight  string   `json:"kRIT,omitempty"`   // kRIT
+	KeyShfLeft   string   `json:"kLFT,omitempty"`   // kLFT
+	KeyShfHome   string   `json:"kHOM,omitempty"`   // kHOM
+	KeyShfEnd    string   `json:"kEND,omitempty"`   // kEND
+
+	// These are non-standard extensions to terminfo.  This includes
+	// true color support, and some additional keys.  Its kind of bizarre
+	// that shifted variants of left and right exist, but not up and down.
+	// Terminal support for these are going to vary amongst XTerm
+	// emulations, so don't depend too much on them in your application.
+
+	SetFgBg         string `json:"_setfgbg,omitempty"`    // setfgbg
+	SetFgBgRGB      string `json:"_setfgbgrgb,omitempty"` // setfgbgrgb
+	SetFgRGB        string `json:"_setfrgb,omitempty"`    // setfrgb
+	SetBgRGB        string `json:"_setbrgb,omitempty"`    // setbrgb
+	KeyShfUp        string `json:"_kscu1,omitempty"`      // shift-up
+	KeyShfDown      string `json:"_kscud1,omitempty"`     // shift-down
+	KeyCtrlUp       string `json:"_kccu1,omitempty"`      // ctrl-up
+	KeyCtrlDown     string `json:"_kccud1,omitempty"`     // ctrl-left
+	KeyCtrlRight    string `json:"_kccuf1,omitempty"`     // ctrl-right
+	KeyCtrlLeft     string `json:"_kccub1,omitempty"`     // ctrl-left
+	KeyMetaUp       string `json:"_kmcu1,omitempty"`      // meta-up
+	KeyMetaDown     string `json:"_kmcud1,omitempty"`     // meta-left
+	KeyMetaRight    string `json:"_kmcuf1,omitempty"`     // meta-right
+	KeyMetaLeft     string `json:"_kmcub1,omitempty"`     // meta-left
+	KeyAltUp        string `json:"_kacu1,omitempty"`      // alt-up
+	KeyAltDown      string `json:"_kacud1,omitempty"`     // alt-left
+	KeyAltRight     string `json:"_kacuf1,omitempty"`     // alt-right
+	KeyAltLeft      string `json:"_kacub1,omitempty"`     // alt-left
+	KeyCtrlHome     string `json:"_kchome,omitempty"`
+	KeyCtrlEnd      string `json:"_kcend,omitempty"`
+	KeyMetaHome     string `json:"_kmhome,omitempty"`
+	KeyMetaEnd      string `json:"_kmend,omitempty"`
+	KeyAltHome      string `json:"_kahome,omitempty"`
+	KeyAltEnd       string `json:"_kaend,omitempty"`
+	KeyAltShfUp     string `json:"_kascu1,omitempty"`
+	KeyAltShfDown   string `json:"_kascud1,omitempty"`
+	KeyAltShfLeft   string `json:"_kascub1,omitempty"`
+	KeyAltShfRight  string `json:"_kascuf1,omitempty"`
+	KeyMetaShfUp    string `json:"_kmscu1,omitempty"`
+	KeyMetaShfDown  string `json:"_kmscud1,omitempty"`
+	KeyMetaShfLeft  string `json:"_kmscub1,omitempty"`
+	KeyMetaShfRight string `json:"_kmscuf1,omitempty"`
+	KeyCtrlShfUp    string `json:"_kcscu1,omitempty"`
+	KeyCtrlShfDown  string `json:"_kcscud1,omitempty"`
+	KeyCtrlShfLeft  string `json:"_kcscub1,omitempty"`
+	KeyCtrlShfRight string `json:"_kcscuf1,omitempty"`
+	KeyCtrlShfHome  string `json:"_kcHOME,omitempty"`
+	KeyCtrlShfEnd   string `json:"_kcEND,omitempty"`
+	KeyAltShfHome   string `json:"_kaHOME,omitempty"`
+	KeyAltShfEnd    string `json:"_kaEND,omitempty"`
+	KeyMetaShfHome  string `json:"_kmHOME,omitempty"`
+	KeyMetaShfEnd   string `json:"_kmEND,omitempty"`
+}
+
+type stackElem struct {
+	s     string
+	i     int
+	isStr bool
+	isInt bool
+}
+
+type stack []stackElem
+
+func (st stack) Push(v string) stack {
+	e := stackElem{
+		s:     v,
+		isStr: true,
+	}
+	return append(st, e)
+}
+
+func (st stack) Pop() (string, stack) {
+	v := ""
+	if len(st) > 0 {
+		e := st[len(st)-1]
+		st = st[:len(st)-1]
+		if e.isStr {
+			v = e.s
+		} else {
+			v = strconv.Itoa(e.i)
+		}
+	}
+	return v, st
+}
+
+func (st stack) PopInt() (int, stack) {
+	if len(st) > 0 {
+		e := st[len(st)-1]
+		st = st[:len(st)-1]
+		if e.isInt {
+			return e.i, st
+		} else if e.isStr {
+			i, _ := strconv.Atoi(e.s)
+			return i, st
+		}
+	}
+	return 0, st
+}
+
+func (st stack) PopBool() (bool, stack) {
+	if len(st) > 0 {
+		e := st[len(st)-1]
+		st = st[:len(st)-1]
+		if e.isStr {
+			if e.s == "1" {
+				return true, st
+			}
+			return false, st
+		} else if e.i == 1 {
+			return true, st
+		} else {
+			return false, st
+		}
+	}
+	return false, st
+}
+
+func (st stack) PushInt(i int) stack {
+	e := stackElem{
+		i:     i,
+		isInt: true,
+	}
+	return append(st, e)
+}
+
+func (st stack) PushBool(i bool) stack {
+	if i {
+		return st.PushInt(1)
+	}
+	return st.PushInt(0)
+}
+
+func nextch(s string, index int) (byte, int) {
+	if index < len(s) {
+		return s[index], index + 1
+	}
+	return 0, index
+}
+
+// static vars
+var svars [26]string
+
+// paramsBuffer handles some persistent state for TParam.  Technically we
+// could probably dispense with this, but caching buffer arrays gives us
+// a nice little performance boost.  Furthermore, we know that TParam is
+// rarely (never?) called re-entrantly, so we can just reuse the same
+// buffers, making it thread-safe by stashing a lock.
+type paramsBuffer struct {
+	out bytes.Buffer
+	buf bytes.Buffer
+	lk  sync.Mutex
+}
+
+// Start initializes the params buffer with the initial string data.
+// It also locks the paramsBuffer.  The caller must call End() when
+// finished.
+func (pb *paramsBuffer) Start(s string) {
+	pb.lk.Lock()
+	pb.out.Reset()
+	pb.buf.Reset()
+	pb.buf.WriteString(s)
+}
+
+// End returns the final output from TParam, but it also releases the lock.
+func (pb *paramsBuffer) End() string {
+	s := pb.out.String()
+	pb.lk.Unlock()
+	return s
+}
+
+// NextCh returns the next input character to the expander.
+func (pb *paramsBuffer) NextCh() (byte, error) {
+	return pb.buf.ReadByte()
+}
+
+// PutCh "emits" (rather schedules for output) a single byte character.
+func (pb *paramsBuffer) PutCh(ch byte) {
+	pb.out.WriteByte(ch)
+}
+
+// PutString schedules a string for output.
+func (pb *paramsBuffer) PutString(s string) {
+	pb.out.WriteString(s)
+}
+
+var pb = &paramsBuffer{}
+
+// TParm takes a terminfo parameterized string, such as setaf or cup, and
+// evaluates the string, and returns the result with the parameter
+// applied.
+func (t *Terminfo) TParm(s string, p ...int) string {
+	var stk stack
+	var a, b string
+	var ai, bi int
+	var ab bool
+	var dvars [26]string
+	var params [9]int
+
+	pb.Start(s)
+
+	// make sure we always have 9 parameters -- makes it easier
+	// later to skip checks
+	for i := 0; i < len(params) && i < len(p); i++ {
+		params[i] = p[i]
+	}
+
+	nest := 0
+
+	for {
+
+		ch, err := pb.NextCh()
+		if err != nil {
+			break
+		}
+
+		if ch != '%' {
+			pb.PutCh(ch)
+			continue
+		}
+
+		ch, err = pb.NextCh()
+		if err != nil {
+			// XXX Error
+			break
+		}
+
+		switch ch {
+		case '%': // quoted %
+			pb.PutCh(ch)
+
+		case 'i': // increment both parameters (ANSI cup support)
+			params[0]++
+			params[1]++
+
+		case 'c', 's':
+			// NB: these, and 'd' below are special cased for
+			// efficiency.  They could be handled by the richer
+			// format support below, less efficiently.
+			a, stk = stk.Pop()
+			pb.PutString(a)
+
+		case 'd':
+			ai, stk = stk.PopInt()
+			pb.PutString(strconv.Itoa(ai))
+
+		case '0', '1', '2', '3', '4', 'x', 'X', 'o', ':':
+			// This is pretty suboptimal, but this is rarely used.
+			// None of the mainstream terminals use any of this,
+			// and it would surprise me if this code is ever
+			// executed outside of test cases.
+			f := "%"
+			if ch == ':' {
+				ch, _ = pb.NextCh()
+			}
+			f += string(ch)
+			for ch == '+' || ch == '-' || ch == '#' || ch == ' ' {
+				ch, _ = pb.NextCh()
+				f += string(ch)
+			}
+			for (ch >= '0' && ch <= '9') || ch == '.' {
+				ch, _ = pb.NextCh()
+				f += string(ch)
+			}
+			switch ch {
+			case 'd', 'x', 'X', 'o':
+				ai, stk = stk.PopInt()
+				pb.PutString(fmt.Sprintf(f, ai))
+			case 'c', 's':
+				a, stk = stk.Pop()
+				pb.PutString(fmt.Sprintf(f, a))
+			}
+
+		case 'p': // push parameter
+			ch, _ = pb.NextCh()
+			ai = int(ch - '1')
+			if ai >= 0 && ai < len(params) {
+				stk = stk.PushInt(params[ai])
+			} else {
+				stk = stk.PushInt(0)
+			}
+
+		case 'P': // pop & store variable
+			ch, _ = pb.NextCh()
+			if ch >= 'A' && ch <= 'Z' {
+				svars[int(ch-'A')], stk = stk.Pop()
+			} else if ch >= 'a' && ch <= 'z' {
+				dvars[int(ch-'a')], stk = stk.Pop()
+			}
+
+		case 'g': // recall & push variable
+			ch, _ = pb.NextCh()
+			if ch >= 'A' && ch <= 'Z' {
+				stk = stk.Push(svars[int(ch-'A')])
+			} else if ch >= 'a' && ch <= 'z' {
+				stk = stk.Push(dvars[int(ch-'a')])
+			}
+
+		case '\'': // push(char)
+			ch, _ = pb.NextCh()
+			pb.NextCh() // must be ' but we don't check
+			stk = stk.Push(string(ch))
+
+		case '{': // push(int)
+			ai = 0
+			ch, _ = pb.NextCh()
+			for ch >= '0' && ch <= '9' {
+				ai *= 10
+				ai += int(ch - '0')
+				ch, _ = pb.NextCh()
+			}
+			// ch must be '}' but no verification
+			stk = stk.PushInt(ai)
+
+		case 'l': // push(strlen(pop))
+			a, stk = stk.Pop()
+			stk = stk.PushInt(len(a))
+
+		case '+':
+			bi, stk = stk.PopInt()
+			ai, stk = stk.PopInt()
+			stk = stk.PushInt(ai + bi)
+
+		case '-':
+			bi, stk = stk.PopInt()
+			ai, stk = stk.PopInt()
+			stk = stk.PushInt(ai - bi)
+
+		case '*':
+			bi, stk = stk.PopInt()
+			ai, stk = stk.PopInt()
+			stk = stk.PushInt(ai * bi)
+
+		case '/':
+			bi, stk = stk.PopInt()
+			ai, stk = stk.PopInt()
+			if bi != 0 {
+				stk = stk.PushInt(ai / bi)
+			} else {
+				stk = stk.PushInt(0)
+			}
+
+		case 'm': // push(pop mod pop)
+			bi, stk = stk.PopInt()
+			ai, stk = stk.PopInt()
+			if bi != 0 {
+				stk = stk.PushInt(ai % bi)
+			} else {
+				stk = stk.PushInt(0)
+			}
+
+		case '&': // AND
+			bi, stk = stk.PopInt()
+			ai, stk = stk.PopInt()
+			stk = stk.PushInt(ai & bi)
+
+		case '|': // OR
+			bi, stk = stk.PopInt()
+			ai, stk = stk.PopInt()
+			stk = stk.PushInt(ai | bi)
+
+		case '^': // XOR
+			bi, stk = stk.PopInt()
+			ai, stk = stk.PopInt()
+			stk = stk.PushInt(ai ^ bi)
+
+		case '~': // bit complement
+			ai, stk = stk.PopInt()
+			stk = stk.PushInt(ai ^ -1)
+
+		case '!': // logical NOT
+			ai, stk = stk.PopInt()
+			stk = stk.PushBool(ai != 0)
+
+		case '=': // numeric compare or string compare
+			b, stk = stk.Pop()
+			a, stk = stk.Pop()
+			stk = stk.PushBool(a == b)
+
+		case '>': // greater than, numeric
+			bi, stk = stk.PopInt()
+			ai, stk = stk.PopInt()
+			stk = stk.PushBool(ai > bi)
+
+		case '<': // less than, numeric
+			bi, stk = stk.PopInt()
+			ai, stk = stk.PopInt()
+			stk = stk.PushBool(ai < bi)
+
+		case '?': // start conditional
+
+		case 't':
+			ab, stk = stk.PopBool()
+			if ab {
+				// just keep going
+				break
+			}
+			nest = 0
+		ifloop:
+			// this loop consumes everything until we hit our else,
+			// or the end of the conditional
+			for {
+				ch, err = pb.NextCh()
+				if err != nil {
+					break
+				}
+				if ch != '%' {
+					continue
+				}
+				ch, _ = pb.NextCh()
+				switch ch {
+				case ';':
+					if nest == 0 {
+						break ifloop
+					}
+					nest--
+				case '?':
+					nest++
+				case 'e':
+					if nest == 0 {
+						break ifloop
+					}
+				}
+			}
+
+		case 'e':
+			// if we got here, it means we didn't use the else
+			// in the 't' case above, and we should skip until
+			// the end of the conditional
+			nest = 0
+		elloop:
+			for {
+				ch, err = pb.NextCh()
+				if err != nil {
+					break
+				}
+				if ch != '%' {
+					continue
+				}
+				ch, _ = pb.NextCh()
+				switch ch {
+				case ';':
+					if nest == 0 {
+						break elloop
+					}
+					nest--
+				case '?':
+					nest++
+				}
+			}
+
+		case ';': // endif
+
+		}
+	}
+
+	return pb.End()
+}
+
+// TPuts emits the string to the writer, but expands inline padding
+// indications (of the form $<[delay]> where [delay] is msec) to
+// a suitable number of padding characters (usually null bytes) based
+// upon the supplied baud.  At high baud rates, more padding characters
+// will be inserted.  All Terminfo based strings should be emitted using
+// this function.
+func (t *Terminfo) TPuts(w io.Writer, s string, baud int) {
+	for {
+		beg := strings.Index(s, "$<")
+		if beg < 0 {
+			// Most strings don't need padding, which is good news!
+			io.WriteString(w, s)
+			return
+		}
+		io.WriteString(w, s[:beg])
+		s = s[beg+2:]
+		end := strings.Index(s, ">")
+		if end < 0 {
+			// unterminated.. just emit bytes unadulterated
+			io.WriteString(w, "$<"+s)
+			return
+		}
+		val := s[:end]
+		s = s[end+1:]
+		padus := 0
+		unit := 1000
+		dot := false
+	loop:
+		for i := range val {
+			switch val[i] {
+			case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9':
+				padus *= 10
+				padus += int(val[i] - '0')
+				if dot {
+					unit *= 10
+				}
+			case '.':
+				if !dot {
+					dot = true
+				} else {
+					break loop
+				}
+			default:
+				break loop
+			}
+		}
+		cnt := int(((baud / 8) * padus) / unit)
+		for cnt > 0 {
+			io.WriteString(w, t.PadChar)
+			cnt--
+		}
+	}
+}
+
+// TGoto returns a string suitable for addressing the cursor at the given
+// row and column.  The origin 0, 0 is in the upper left corner of the screen.
+func (t *Terminfo) TGoto(col, row int) string {
+	return t.TParm(t.SetCursor, row, col)
+}
+
+// TColor returns a string corresponding to the given foreground and background
+// colors.  Either fg or bg can be set to -1 to elide.
+func (t *Terminfo) TColor(fi, bi int) string {
+	rv := ""
+	// As a special case, we map bright colors to lower versions if the
+	// color table only holds 8.  For the remaining 240 colors, the user
+	// is out of luck.  Someday we could create a mapping table, but its
+	// not worth it.
+	if t.Colors == 8 {
+		if fi > 7 && fi < 16 {
+			fi -= 8
+		}
+		if bi > 7 && bi < 16 {
+			bi -= 8
+		}
+	}
+	if t.Colors > fi && fi >= 0 {
+		rv += t.TParm(t.SetFg, fi)
+	}
+	if t.Colors > bi && bi >= 0 {
+		rv += t.TParm(t.SetBg, bi)
+	}
+	return rv
+}
+
+var (
+	dblock    sync.Mutex
+	terminfos = make(map[string]*Terminfo)
+	aliases   = make(map[string]string)
+)
+
+// AddTerminfo can be called to register a new Terminfo entry.
+func AddTerminfo(t *Terminfo) {
+	dblock.Lock()
+	terminfos[t.Name] = t
+	for _, x := range t.Aliases {
+		terminfos[x] = t
+	}
+	dblock.Unlock()
+}
+
+func loadFromFile(fname string, term string) (*Terminfo, error) {
+	var e error
+	var f io.Reader
+	if f, e = os.Open(fname); e != nil {
+		return nil, e
+	}
+	if strings.HasSuffix(fname, ".gz") {
+		if f, e = gzip.NewReader(f); e != nil {
+			return nil, e
+		}
+	}
+	d := json.NewDecoder(f)
+	for {
+		t := &Terminfo{}
+		if e := d.Decode(t); e != nil {
+			if e == io.EOF {
+				return nil, ErrTermNotFound
+			}
+			return nil, e
+		}
+		if t.SetCursor == "" {
+			// This must be an alias record, return it.
+			return t, nil
+		}
+		if t.Name == term {
+			return t, nil
+		}
+		for _, a := range t.Aliases {
+			if a == term {
+				return t, nil
+			}
+		}
+	}
+}
+
+// LookupTerminfo attempts to find a definition for the named $TERM.
+// It first looks in the builtin database, which should cover just about
+// everyone.  If it can't find one there, then it will attempt to read
+// one from the JSON file located in either $TCELLDB, $HOME/.tcelldb
+// or in this package's source directory as database.json).
+func LookupTerminfo(name string) (*Terminfo, error) {
+	if name == "" {
+		// else on windows: index out of bounds
+		// on the name[0] reference below
+		return nil, ErrTermNotFound
+	}
+
+	dblock.Lock()
+	t := terminfos[name]
+	dblock.Unlock()
+
+	if t == nil {
+
+		var files []string
+		letter := fmt.Sprintf("%02x", name[0])
+		gzfile := path.Join(letter, name+".gz")
+		jsfile := path.Join(letter, name)
+
+		// Build up the search path.  Old versions of tcell used a
+		// single database file, whereas the new ones locate them
+		// in JSON (optionally compressed) files.
+		//
+		// The search path looks like:
+		//
+		// $TCELLDB/x/xterm.gz
+		// $TCELLDB/x/xterm
+		// $TCELLDB
+		// $HOME/.tcelldb/x/xterm.gz
+		// $HOME/.tcelldb/x/xterm
+		// $HOME/.tcelldb
+		// $GOPATH/terminfo/database/x/xterm.gz
+		// $GOPATH/terminfo/database/x/xterm
+		//
+		if pth := os.Getenv("TCELLDB"); pth != "" {
+			files = append(files, path.Join(pth, gzfile))
+			files = append(files, path.Join(pth, jsfile))
+			files = append(files, pth)
+		}
+		if pth := os.Getenv("HOME"); pth != "" {
+			pth = path.Join(pth, ".tcelldb")
+			files = append(files, path.Join(pth, gzfile))
+			files = append(files, path.Join(pth, jsfile))
+			files = append(files, pth)
+		}
+
+		for _, pth := range strings.Split(os.Getenv("GOPATH"), string(os.PathListSeparator)) {
+			pth = path.Join(pth, "src", "github.com", "gdamore", "tcell", "terminfo", "database")
+			files = append(files, path.Join(pth, gzfile))
+			files = append(files, path.Join(pth, jsfile))
+		}
+
+		for _, fname := range files {
+			t, _ = loadFromFile(fname, name)
+			if t != nil {
+				break
+			}
+		}
+		if t != nil {
+			if t.Name != name {
+				// Check for a database loop (no infinite
+				// recursion).
+				dblock.Lock()
+				if aliases[name] != "" {
+					dblock.Unlock()
+					return nil, ErrTermNotFound
+				}
+				aliases[name] = t.Name
+				dblock.Unlock()
+				return LookupTerminfo(t.Name)
+			}
+			dblock.Lock()
+			terminfos[name] = t
+			dblock.Unlock()
+		}
+	}
+	if t == nil {
+		return nil, ErrTermNotFound
+	}
+	return t, nil
+}
--- a/cmd/micro/terminfo/terminfo_test.go
+++ b/cmd/micro/terminfo/terminfo_test.go
@@ -0,0 +1,194 @@
+// Copyright 2016 The TCell Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use file except in compliance with the License.
+// You may obtain a copy of the license at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package terminfo
+
+import (
+	"bytes"
+	"os"
+	"testing"
+
+	. "github.com/smartystreets/goconvey/convey"
+)
+
+// This terminfo entry is a stripped down version from
+// xterm-256color, but I've added some of my own entries.
+var testTerminfo = &Terminfo{
+	Name:      "simulation_test",
+	Columns:   80,
+	Lines:     24,
+	Colors:    256,
+	Bell:      "\a",
+	Blink:     "\x1b2ms$<2>",
+	Reverse:   "\x1b[7m",
+	SetFg:     "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m",
+	SetBg:     "\x1b[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m",
+	AltChars:  "``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~",
+	Mouse:     "\x1b[M",
+	MouseMode: "%?%p1%{1}%=%t%'h'%Pa%e%'l'%Pa%;\x1b[?1000%ga%c\x1b[?1003%ga%c\x1b[?1006%ga%c",
+	SetCursor: "\x1b[%i%p1%d;%p2%dH",
+	PadChar:   "\x00",
+}
+
+func TestTerminfo(t *testing.T) {
+
+	ti := testTerminfo
+
+	Convey("Terminfo parameter processing", t, func() {
+		// This tests %i, and basic parameter strings too
+		Convey("TGoto works", func() {
+			s := ti.TGoto(7, 9)
+			So(s, ShouldEqual, "\x1b[10;8H")
+		})
+
+		// This tests some conditionals
+		Convey("TParm extended formats work", func() {
+			s := ti.TParm("A[%p1%2.2X]B", 47)
+			So(s, ShouldEqual, "A[2F]B")
+		})
+
+		// This tests some conditionals
+		Convey("TParm colors work", func() {
+			s := ti.TParm(ti.SetFg, 7)
+			So(s, ShouldEqual, "\x1b[37m")
+
+			s = ti.TParm(ti.SetFg, 15)
+			So(s, ShouldEqual, "\x1b[97m")
+
+			s = ti.TParm(ti.SetFg, 200)
+			So(s, ShouldEqual, "\x1b[38;5;200m")
+		})
+
+		// This tests variables
+		Convey("TParm mouse mode works", func() {
+			s := ti.TParm(ti.MouseMode, 1)
+			So(s, ShouldEqual, "\x1b[?1000h\x1b[?1003h\x1b[?1006h")
+			s = ti.TParm(ti.MouseMode, 0)
+			So(s, ShouldEqual, "\x1b[?1000l\x1b[?1003l\x1b[?1006l")
+		})
+
+	})
+
+	Convey("Terminfo delay handling", t, func() {
+
+		Convey("19200 baud", func() {
+			buf := bytes.NewBuffer(nil)
+			ti.TPuts(buf, ti.Blink, 19200)
+			s := string(buf.Bytes())
+			So(s, ShouldEqual, "\x1b2ms\x00\x00\x00\x00")
+		})
+
+		Convey("50 baud", func() {
+			buf := bytes.NewBuffer(nil)
+			ti.TPuts(buf, ti.Blink, 50)
+			s := string(buf.Bytes())
+			So(s, ShouldEqual, "\x1b2ms")
+		})
+	})
+}
+
+func TestTerminfoDatabase(t *testing.T) {
+
+	Convey("Database Lookups work", t, func() {
+		Convey("Basic lookup works", func() {
+			os.Setenv("TCELLDB", "testdata/test1")
+			ti, err := LookupTerminfo("test1")
+			So(err, ShouldBeNil)
+			So(ti, ShouldNotBeNil)
+			So(ti.Columns, ShouldEqual, 80)
+
+			ti, err = LookupTerminfo("alias1")
+			So(err, ShouldBeNil)
+			So(ti, ShouldNotBeNil)
+			So(ti.Columns, ShouldEqual, 80)
+
+			os.Setenv("TCELLDB", "testdata")
+			ti, err = LookupTerminfo("test2")
+			So(err, ShouldBeNil)
+			So(ti, ShouldNotBeNil)
+			So(ti.Columns, ShouldEqual, 80)
+			So(len(ti.Aliases), ShouldEqual, 1)
+			So(ti.Aliases[0], ShouldEqual, "alias2")
+		})
+
+		Convey("Incorrect primary name works", func() {
+			os.Setenv("TCELLDB", "testdata")
+			ti, err := LookupTerminfo("test3")
+			So(err, ShouldNotBeNil)
+			So(ti, ShouldBeNil)
+		})
+
+		Convey("Loops fail", func() {
+			os.Setenv("TCELLDB", "testdata")
+			ti, err := LookupTerminfo("loop1")
+			So(ti, ShouldBeNil)
+			So(err, ShouldNotBeNil)
+		})
+
+		Convey("Gzip database works", func() {
+			os.Setenv("TCELLDB", "testdata")
+			ti, err := LookupTerminfo("test-gzip")
+			So(err, ShouldBeNil)
+			So(ti, ShouldNotBeNil)
+			So(ti.Columns, ShouldEqual, 80)
+		})
+
+		Convey("Gzip alias lookup works", func() {
+			os.Setenv("TCELLDB", "testdata")
+			ti, err := LookupTerminfo("alias-gzip")
+			So(err, ShouldBeNil)
+			So(ti, ShouldNotBeNil)
+			So(ti.Columns, ShouldEqual, 80)
+		})
+
+		Convey("Broken alias works", func() {
+			os.Setenv("TCELLDB", "testdata")
+			ti, err := LookupTerminfo("alias-none")
+			So(err, ShouldNotBeNil)
+			So(ti, ShouldBeNil)
+		})
+
+		Convey("Combined database works", func() {
+			os.Setenv("TCELLDB", "testdata/combined")
+			ti, err := LookupTerminfo("combined2")
+			So(err, ShouldBeNil)
+			So(ti, ShouldNotBeNil)
+			So(ti.Lines, ShouldEqual, 102)
+
+			ti, err = LookupTerminfo("alias-comb1")
+			So(err, ShouldBeNil)
+			So(ti, ShouldNotBeNil)
+			So(ti.Lines, ShouldEqual, 101)
+
+			ti, err = LookupTerminfo("combined3")
+			So(err, ShouldBeNil)
+			So(ti, ShouldNotBeNil)
+			So(ti.Lines, ShouldEqual, 103)
+
+			ti, err = LookupTerminfo("combined1")
+			So(err, ShouldBeNil)
+			So(ti, ShouldNotBeNil)
+			So(ti.Lines, ShouldEqual, 101)
+		})
+	})
+}
+
+func BenchmarkSetFgBg(b *testing.B) {
+	ti := testTerminfo
+
+	for i := 0; i < b.N; i++ {
+		ti.TParm(ti.SetFg, 100, 200)
+		ti.TParm(ti.SetBg, 100, 200)
+	}
+}
--- a/cmd/micro/util.go
+++ b/cmd/micro/util.go
@@ -2,6 +2,7 @@ package main

 import (
 	"os"
+	"os/user"
 	"path/filepath"
 	"reflect"
 	"runtime"
@@ -11,7 +12,6 @@ import (
 	"unicode/utf8"

 	"github.com/mattn/go-runewidth"
-	homedir "github.com/mitchellh/go-homedir"
 )

 // Util.go is a collection of utility functions that are used throughout
@@ -23,6 +23,54 @@ func Count(s string) int {
 	return utf8.RuneCountInString(s)
 }

+// Convert byte array to rune array
+func toRunes(b []byte) []rune {
+	runes := make([]rune, 0, utf8.RuneCount(b))
+
+	for len(b) > 0 {
+		r, size := utf8.DecodeRune(b)
+		runes = append(runes, r)
+
+		b = b[size:]
+	}
+
+	return runes
+}
+
+func sliceStart(slc []byte, index int) []byte {
+	len := len(slc)
+	i := 0
+	totalSize := 0
+	for totalSize < len {
+		if i >= index {
+			return slc[totalSize:]
+		}
+
+		_, size := utf8.DecodeRune(slc[totalSize:])
+		totalSize += size
+		i++
+	}
+
+	return slc[totalSize:]
+}
+
+func sliceEnd(slc []byte, index int) []byte {
+	len := len(slc)
+	i := 0
+	totalSize := 0
+	for totalSize < len {
+		if i >= index {
+			return slc[:totalSize]
+		}
+
+		_, size := utf8.DecodeRune(slc[totalSize:])
+		totalSize += size
+		i++
+	}
+
+	return slc[:totalSize]
+}
+
 // NumOccurrences counts the number of occurrences of a byte in a string
 func NumOccurrences(s string, c byte) int {
 	var n int
@@ -130,7 +178,7 @@ func GetLeadingWhitespace(str string) string {
 }

 // IsSpaces checks if a given string is only spaces
-func IsSpaces(str string) bool {
+func IsSpaces(str []byte) bool {
 	for _, c := range str {
 		if c != ' ' {
 			return false
@@ -282,10 +330,37 @@ func ReplaceHome(path string) string {
 		return path
 	}

-	home, err := homedir.Dir()
-	if err != nil {
-		messenger.Error("Could not find home directory: ", err)
-		return path
+	var userData *user.User
+	var err error
+
+	homeString := strings.Split(path, "/")[0]
+	if homeString == "~" {
+		userData, err = user.Current()
+		if err != nil {
+			messenger.Error("Could not find user: ", err)
+		}
+	} else {
+		userData, err = user.Lookup(homeString[1:])
+		if err != nil {
+			if messenger != nil {
+				messenger.Error("Could not find user: ", err)
+			} else {
+				TermMessage("Could not find user: ", err)
+			}
+			return ""
+		}
 	}
-	return strings.Replace(path, "~", home, 1)
+
+	home := userData.HomeDir
+
+	return strings.Replace(path, homeString, home, 1)
+}
+
+// GetPath returns a filename without everything following a `:`
+// This is used for opening files like util.go:10:5 to specify a line and column
+func GetPath(path string) string {
+	if strings.Contains(path, ":") {
+		path = strings.Split(path, ":")[0]
+	}
+	return path
 }
--- a/cmd/micro/vendor/github.com/jtolds/gls
+++ b/cmd/micro/vendor/github.com/jtolds/gls
--- a/cmd/micro/vendor/github.com/smartystreets/assertions
+++ b/cmd/micro/vendor/github.com/smartystreets/assertions
--- a/cmd/micro/vendor/github.com/smartystreets/goconvey
+++ b/cmd/micro/vendor/github.com/smartystreets/goconvey
--- a/cmd/micro/vendor/github.com/zyedidia/clipboard
+++ b/cmd/micro/vendor/github.com/zyedidia/clipboard
--- a/cmd/micro/view.go
+++ b/cmd/micro/view.go
@@ -2,7 +2,6 @@ package main

 import (
 	"fmt"
-	"os"
 	"reflect"
 	"strconv"
 	"strings"
@@ -283,25 +282,11 @@ func (v *View) OpenBuffer(buf *Buffer) {
 }

 // Open opens the given file in the view
-func (v *View) Open(filename string) {
-	filename = ReplaceHome(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()
-
-	var buf *Buffer
+func (v *View) Open(path string) {
+	buf, err := NewBufferFromFile(path)
 	if err != nil {
-		messenger.Message(err.Error())
-		// File does not exist -- create an empty buffer with that name
-		buf = NewBufferFromString("", filename)
-	} else {
-		buf = NewBuffer(file, FSize(file), filename)
+		messenger.Error(err)
+		return
 	}
 	v.OpenBuffer(buf)
 }
@@ -451,7 +436,7 @@ func (v *View) Relocate() bool {
 	if cy > v.Topline+height-1-scrollmargin && cy < v.Buf.NumLines-scrollmargin {
 		v.Topline = cy - height + 1 + scrollmargin
 		ret = true
-	} else if cy >= v.Buf.NumLines-scrollmargin && cy > height {
+	} else if cy >= v.Buf.NumLines-scrollmargin && cy >= height {
 		v.Topline = v.Buf.NumLines - height
 		ret = true
 	}
@@ -525,7 +510,8 @@ func (v *View) ExecuteActions(actions []func(*View, bool) bool) bool {
 	for _, action := range actions {
 		readonlyBindingsResult := false
 		funcName := ShortFuncName(action)
-		if v.Type.Readonly == true {
+		curv := CurView()
+		if curv.Type.Readonly == true {
 			// check for readonly and if true only let key bindings get called if they do not change the contents.
 			for _, readonlyBindings := range readonlyBindingsList {
 				if strings.Contains(funcName, readonlyBindings) {
@@ -535,7 +521,7 @@ func (v *View) ExecuteActions(actions []func(*View, bool) bool) bool {
 		}
 		if !readonlyBindingsResult {
 			// call the key binding
-			relocate = action(v, true) || relocate
+			relocate = action(curv, true) || relocate
 			// Macro
 			if funcName != "ToggleMacro" && funcName != "PlayMacro" {
 				if recordingMacro {
--- a/runtime/colorschemes/darcula.micro
+++ b/runtime/colorschemes/darcula.micro
@@ -19,8 +19,8 @@ color-link line-number "#666666,#242424"
 color-link current-line-number "#666666,#242424"
 color-link gutter-error "#CB4B16,#242424"
 color-link gutter-warning "#E6DB74,#242424"
-color-link cursor-line "#2C2C2C"
-color-link color-column "#2C2C2C"
+color-link cursor-line "default,#2C2C2C"
+color-link color-column "default,#2C2C2C"
 #No extended types; Plain brackets.
 color-link type.extended "default"
 #color-link symbol.brackets "default"
--- a/runtime/help/colors.md
+++ b/runtime/help/colors.md
@@ -8,6 +8,13 @@ This help page aims to cover two aspects of micro's syntax highlighting engine:

 ## Colorschemes

+To change your colorscheme, press Ctrl-E in micro to bring up the command
+prompt, and type:
+```
+set colorscheme solarized
+```
+(or whichever colorscheme you choose).
+
 Micro comes with a number of colorschemes by default. Here is the list:

 ### 256 color
@@ -49,18 +56,20 @@ These require terminals that support true color and require `MICRO_TRUECOLOR=1`
 * `gruvbox-tc`: The true color version of the gruvbox colorscheme
 * `github-tc`: The true color version of the Github colorscheme

-To enable one of these colorschemes just press CtrlE in micro and type
-`set colorscheme solarized`. (or whichever one you choose). You can also use
-`set colorscheme monochrome` if you'd prefer to have just the terminal's default
+### Monochrome
+
+You can also use `monochrome` if you'd prefer to have just the terminal's default
 foreground and background colors. Note: This provides no syntax highlighting!

+### Other
+
 See `help gimmickcolors` for a list of some true colour themes that are more 
 just for fun than for serious use. (Though feel free if you want!)


 ## Creating a Colorscheme

-Micro's colorschemes are also extremely simple to create. The default ones ca
+Micro's colorschemes are also extremely simple to create. The default ones can
 be found
 [here](https://github.com/zyedidia/micro/tree/master/runtime/colorschemes).

--- a/runtime/help/defaultkeys.md
+++ b/runtime/help/defaultkeys.md
@@ -95,6 +95,7 @@ can change it!
 | Alt+P             | Remove latest multiple cursor                                                                 |
 | Alt+C             | Remove all multiple cursors (cancel)                                                          |
 | Alt+X             | Skip multiple cursor selection                                                                |
+| Alt+M             | Spawn a new cursor at the beginning of every line in the current selection                    |
 | Ctrl-MouseLeft    | Place a multiple cursor at any location                                                       |

 ### Other
--- a/runtime/help/keybindings.md
+++ b/runtime/help/keybindings.md
@@ -215,6 +215,7 @@ Suspend (Unix only)
 ScrollUp
 ScrollDown
 SpawnMultiCursor
+SpawnMultiCursorSelect
 RemoveMultiCursor
 RemoveAllMultiCursors
 SkipMultiCursor
@@ -464,6 +465,7 @@ MouseWheelRight

    // Multiple cursors bindings
    "Alt-n": "SpawnMultiCursor",
+    "Alt-m": "SpawnMultiCursorSelect",
    "Alt-p": "RemoveMultiCursor",
    "Alt-c": "RemoveAllMultiCursors",
    "Alt-x": "SkipMultiCursor",
--- a/runtime/help/options.md
+++ b/runtime/help/options.md
@@ -186,6 +186,12 @@ Here are the options that you can set:

    default value: `false`

+* `matchbraceleft`: when matching a closing brace, should matching match the
+   brace directly under the cursor, or the character to the left? only matters
+   if `matchbrace` is true
+
+    default value: `false`
+
 * `syntax`: turns syntax on or off.

 	default value: `true`
--- a/runtime/help/plugins.md
+++ b/runtime/help/plugins.md
@@ -65,6 +65,9 @@ functions are given using Go's type system):
 * `NewBuffer(text, path string) *Buffer`: creates a new buffer from a given
   reader with a given path

+* `NewBufferFromFile(path string) *Buffer`: creates a new buffer from a given
+   path
+
 * `GetLeadingWhitespace() bool`: returns the leading whitespace of the given
   string

--- a/runtime/syntax/PowerShell.yaml
+++ b/runtime/syntax/PowerShell.yaml
@@ -0,0 +1,129 @@
+# PowerShell syntax highlighting file for micro - https://micro-editor.github.io/
+# PowerShell syntax taken from: https://github.com/PowerShell/EditorSyntax
+
+filetype: powershell
+
+detect:
+    filename: "\\.ps(1|m1|d1)$"
+    #header: ""
+
+rules:
+    # - comment.block:           # Block Comment
+    # - comment.doc:             # Doc Comment
+    # - comment.line:            # Line Comment
+    # - comment.shebang:         # Shebang Line
+
+    # - constant:                # Constant
+    # - constant.bool:           # Constant (true, false)
+    # - constant.interpolation:
+    # - constant.number:         # Constant (null)
+    # - constant.specialChar:
+    # - constant.string:         # String
+    # - constant.string.char:
+    # - constant.string.url:     # Uri
+    # - constant.unicode:
+
+    # - identifier:              # Also used for functions
+    # - identifier.class:        # Also used for functions
+    # - identifier.macro:
+    # - identifier.var:
+
+    # - preproc:                 # Preprocessor
+    # - preproc.DebugIdentifier: # Preprocessor
+    # - preproc.shebang:         # The #! at the beginning of a file that tells the os what script interpreter to use
+
+    # - special:                 # Special (global|local|private|script|using|workflow)
+
+    # - statement:               # Statements Keywords
+    # - statement.built_in:
+    # - statement.declaration:   # Declaration Keywords
+    # - statement.meta:          # Meta
+    # - statement.reserved:      # Reserved Keywords
+
+    # - symbol
+    # - symbol.brackets:         # {}()[] and sometimes <>
+    # - symbol.operator:         # Operators
+    # - symbol.tag:              # For html tags, among other things
+
+    # - type
+    # - type.collections:        # Collections (array, hashtable)
+    # - type.ctypes:             # CTypes (CBool, CChar, etc.)
+    # - type.keyword:            # If you want a special highlight for keywords like 'private'
+    # - type.storage:            # Storage Types (int, uint, string, etc.)
+
+    # Class
+    - identifier.class: "class +[A-Za-z0-9]+ *((:) +[A-Za-z0-9.]+)?"
+    - identifier.class: "(function)(?:([[:space:]][A-Za-z0-9]+[[:space:]]*))"
+
+    # Verbs taken from PwSh 6.0.2
+    - identifier: "(Add|Approve|Assert|Backup|Block|Build|Checkpoint|Clear|Close|Compare|Complete|Compress|Confirm|Connect|Convert|ConvertFrom|ConvertTo|Copy)[-][A-Za-z0-9]+"
+    - identifier: "(Debug|Deny|Deploy|Disable|Disconnect|Dismount|Edit|Enable|Enter|Exit|Expand|Export|Find|Format|Get|Grant|Group|Hide)[-][A-Za-z0-9]+"
+    - identifier: "(Import|Initialize|Install|Invoke|Join|Limit|Lock|Measure|Merge|Mount|Move|New|Open|Optimize|Out|Ping|Pop|Protect|Publish|Push)[-][A-Za-z0-9]+"
+    - identifier: "(Read|Receive|Redo|Register|Remove|Rename|Repair|Request|Reset|Resize|Resolve|Restart|Restore|Resume|Revoke)[-][A-Za-z0-9]+"
+    - identifier: "(Save|Search|Select|Send|Set|Show|Skip|Split|Start|Step|Stop|Submit|Suspend|Switch|Sync|Test|Trace)[-][A-Za-z0-9]+"
+    - identifier: "(Unblock|Undo|Uninstall|Unlock|Unprotect|Unpublish|Unregister|Update|Use|Wait|Watch|Write)[-][A-Za-z0-9]+"
+    - identifier.var: "\\$(?i)((Global|Local|Private|Script|Using|Workflow)[:])?[A-Za-z0-9]*"
+
+
+    # Expression and types
+    - type: "\\[\\b([A-Za-z]+|[A-Za-z]+[0-9]+)\\b\\]"
+
+    # Keywords
+    - statement: "\\b(alias|as|begin|break|catch|continue|data|default|define|do|dynamicparam)\\b"
+    - statement: "\\b(else|elseif|end|exit|finally|for|foreach|foreach-object|from|if|in|inlinescript)\\b"
+    - statement: "\\b(parallel|param|process|return|switch|throw|trap|try|until|using|var|where|where-object|while)\\b"
+
+    # Special Keywords
+    - special: "\\b(break|continue|exit)\\b"
+
+    - symbol.brackets: "(\\{|\\})"
+    - symbol.brackets: "(\\(|\\))"
+    - symbol.brackets: "(\\[|\\])"
+    - symbol.operator: "[\\-+/*=<>?:!~%&|]"
+    - symbol.operator: "[[:space:]][-](ne|eq|gt|ge|lt|le|like|notlike|match|notmatch|contains|notcontains|in|notin|replace|is|isnot)[[:space:]]"
+
+    # Constants
+    - constant.bool: "\\b\\$(true|false|null)\\b"
+    - constant.number: "\\b([0-9._]+|0x[A-Fa-f0-9_]+|0b[0-1_]+)[FL]?\\b"
+
+    # Expression Mode String
+    - constant.string:
+        start: "\""
+        end: "\""
+        #skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\([btnfr]|'|\\\"|\\\\)"
+            - constant.specialChar: "\\\\u[A-Fa-f0-9]{4}"
+
+    # Argument Mode String
+    - constant.string:
+        start: "'"
+        end: "'"
+        #skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\([btnfr]|'|\\\"|\\\\)"
+            - constant.specialChar: "\\\\u[A-Fa-f0-9]{4}"
+
+    # Line Comment
+    - comment:
+        start: "#"
+        end: "$"
+        rules:
+            - todo: "(TODO|XXX|FIXME|BUG):?"
+
+    # Block Comment
+    - comment:
+        start: "<#"
+        end: "#>"
+        rules:
+            - todo: "(TODO|XXX|FIXME|BUG):?"
+
+    # Embedded C#
+    - default:
+        start: "@\""
+        end: "\"@"
+        rules:
+            - include: "csharp"
+
+    # Todo
+    - todo: "(TODO|XXX|FIXME|BUG):?"
--- a/runtime/syntax/ini.yaml
+++ b/runtime/syntax/ini.yaml
@@ -10,5 +10,15 @@ rules:
    - identifier: "^[[:space:]]*[^=]*="
    - special: "^[[:space:]]*\\[.*\\]$"
    - statement: "[=;]"
-    - comment: "(^|[[:space:]])#([^{].*)?$"
    - constant.string: "\"(\\\\.|[^\"])*\"|'(\\\\.|[^'])*'"
+
+    - comment:
+        start: "#"
+        end: "$"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+    - comment:
+        start: ";"
+        end: "$"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
--- a/runtime/syntax/julia.yaml
+++ b/runtime/syntax/julia.yaml
@@ -13,7 +13,7 @@ rules:
      # definitions
    - identifier: "[A-Za-z_][A-Za-z0-9_]*[[:space:]]*[(]"
      # keywords
-    - statement: "\\b(begin|break|catch|continue|function|elseif|else|end|finally|for|global|local|const|if|include|using|require|macro|println|return|try|type|while|module)\\b"
+    - statement: "\\b(begin|break|catch|continue|function|elseif|else|end|finally|for|global|local|const|if|include|import|using|require|macro|println|return|try|type|while|module)\\b"
      # decorators
    - identifier.macro: "@[A-Za-z0-9_]+"
      # operators
--- a/runtime/syntax/ocaml.yaml
+++ b/runtime/syntax/ocaml.yaml
@@ -4,23 +4,42 @@ detect:
    filename: "\\.mli?$"

 rules:
-    # Numbers
-    ## Integers
-    ### Binary
-    - constant.number: "-?0[bB][01][01_]*"
-    ### Octal
-    - constant.number: "-?0[oO][0-7][0-7_]*"
-    ### Decimal
-    - constant.number: "-?\\d[\\d_]*"
-    ### Hexadecimal
-    - constant.number: "-?0[xX][0-9a-fA-F][0-9a-fA-F_]*"
-    ## Real
-    ### Decimal
-    - constant.number: "-?\\d[\\d_]*.\\d[\\d_]*([eE][+-]\\d[\\d_]*.\\d[\\d_]*)?"
-    ### Hexadecimal
-    - constant.number: "-?0[xX][0-9a-fA-F][0-9a-fA-F_]*.[0-9a-fA-F][0-9a-fA-F_]*([pP][+-][0-9a-fA-F][0-9a-fA-F_]*.[0-9a-fA-F][0-9a-fA-F_]*)?"
-    # Comments
+    - identifier: "\\b[A-Z][0-9a-z_]{2,}\\b"
+      #declarations
+    - statement: "\\b(let|val|method|in|and|rec|private|virtual|constraint)\\b"
+      #structure items
+    - type: "\\b(type|open|class|module|exception|external)\\b"
+      #patterns
+    - statement: "\\b(fun|function|functor|match|try|with)\\b"
+      #patterns-modifiers
+    - statement: "\\b(as|when|of)\\b" 
+      #conditions
+    - statement: "\\b(if|then|else)\\b"
+      #blocs
+    - type: "\\b(begin|end|object|struct|sig|for|while|do|done|to|downto)\\b"
+      #constantes
+    - constant.bool: "\\b(true|false)\\b"
+      #modules/classes
+    - special: "\\b(include|inherit|initializer)\\b"
+      #expr modifiers
+    - special: "\\b(new|ref|mutable|lazy|assert|raise)\\b"
+    - constant.string:
+        start: "'"
+        end: "'"
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "%."
+            - constant.specialChar: "\\\\[abfnrtv'\\\"\\\\]"
+            - constant.specialChar: "\\\\([0-7]{3}|x[A-Fa-f0-9]{2}|u[A-Fa-f0-9]{4}|U[A-Fa-f0-9]{8})"
+    - constant.string:
+        start: "\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "%."
+            - constant.specialChar: "\\\\[abfnrtv'\\\"\\\\]"
+            - constant.specialChar: "\\\\([0-7]{3}|x[A-Fa-f0-9]{2}|u[A-Fa-f0-9]{4}|U[A-Fa-f0-9]{8})"
    - comment:
        start: "\\(\\*"
        end: "\\*\\)"
-        rules: []
+        rules: []
--- a/runtime/syntax/php.yaml
+++ b/runtime/syntax/php.yaml
@@ -18,7 +18,7 @@ rules:
    - comment: "<!--.+?-->"
    - default: "<\\?(php|=)\" end=\"\\?>"
    - identifier.class: "([a-zA-Z0-9_-]+)\\("
-    - preproc: "(require|include|require_once|include_once)"
+    - preproc: "\\b(require|include)(_once)?)\\b"
    - type: "\\b(var|class|extends|function|echo|case|default|exit|switch|extends|as|define|do|declare|in|trait|interface|[E|e]xception|array|int|string|bool|iterable|void)\\b"
    - identifier.class: "[a-zA-Z\\\\]+::"
    - identifier: "([A-Z][a-zA-Z0-9_]+)\\s"
--- a/runtime/syntax/tex.yaml
+++ b/runtime/syntax/tex.yaml
@@ -1,7 +1,7 @@
 filetype: tex

 detect: 
-    filename: "\\.tex$|bib|\\.bib$|cls|\\.cls$"
+    filename: "\\.tex$|\\.bib$|\\.cls$"

 rules:
    # colorize the identifiers of {<identifier>} and [<identifier>]
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -12,11 +12,14 @@ apps:
    command: bin/micro

 parts:
+  go:
+    source-tag: go1.10
  micro:
+    after: [go]
    source: .
    source-type: git
    plugin: nil
-    build-packages: [golang-go, make]
+    build-packages: [make]
    prepare: |
      mkdir -p ../go/src/github.com/zyedidia/micro
      cp -R . ../go/src/github.com/zyedidia/micro
Author	SHA1	Message	Date
Zachary Yedidia	56aa289f81	Add support for COLORTERM	2018-06-03 17:07:44 -04:00
Zachary Yedidia	3c01947cb3	Fix ini comment highlighting Fixes #1094	2018-05-12 21:29:02 -04:00
Zachary Yedidia	53e142fb88	Fix matchbraceleft option Fixes #1101	2018-04-28 17:42:17 -04:00
Zachary Yedidia	2e64499f96	Fix possible crash in findkey Fixes #1103	2018-04-28 17:16:22 -04:00
Zachary Yedidia	11cb702d7f	Merge	2018-04-28 17:04:47 -04:00
Zachary Yedidia	7a2820cbc0	Add hidehelp option Fixes #1080	2018-04-28 17:04:33 -04:00
Mark Weston	b181342ff1	Make ^X act like ^K when nothing is selected (#1092 ) * Make ^X act like ^K when nothing is selected ^K is hard to reach with your left hand or requires to use both hands Also with this you could remove ^K whatsoever and make room for a different command This is how I configured nano by the way Line duplication also becomes nearly instantaneous with a flash-quick ^X+^V+^V combo (nano doesn't have a dedicated shortcut) Small block (5-10 lines) cuts/copies/duplicates can also be made this way * Remove unnecessary lines * Call CutLine the right way	2018-04-23 15:34:45 -04:00
Zachary Yedidia	f0e2f3cc96	Merge pull request #1085 from jtolds/themes darcula: fix highlighted line and color column	2018-04-21 16:57:53 -04:00
Zachary Yedidia	6ef273accd	Merge pull request #1084 from jtolds/master home toggles between start of line and start of text	2018-04-07 20:03:57 -04:00
JT Olio	0eadf283a5	darcula: fix highlighted line and color column	2018-04-05 19:45:28 -06:00
JT Olio	f8a171379a	home toggles between start of line and start of text by default home sends the cursor to the beginning of the line. if the cursor is at the beginning of the line already though, home will send the cursor to the first non-whitespace rune. tapping home will toggle between these two line starts.	2018-04-05 15:25:34 -06:00
Zachary Yedidia	1a62ede320	Build snap using up-to-date golang	2018-04-03 00:53:24 -04:00
Zachary Yedidia	1bb1da4765	Update snapcraft.yaml Go plugin	2018-04-02 21:16:19 -07:00
Zachary Yedidia	987d48038a	Update snapcraft.yaml	2018-04-02 21:07:12 -07:00
Zachary Yedidia	abc04ec521	fix typo	2018-03-31 02:32:48 +00:00
Zachary Yedidia	b7706d775c	Add docs for SpawnMultiCursorSelect	2018-03-30 16:42:28 -04:00
dwwmmn	ac0b89366b	Implement SpawnMultiCursorSelect (#1046 ) Add function to actions.go which adds a new cursor to the beginning of each line of a selection. Bind to Ctrl-M by default.	2018-03-30 16:40:45 -04:00
Zachary Yedidia	3293160dcb	Fix ReplaceHome implementation	2018-03-30 16:21:39 -04:00
DanielPower	804943a1e8	Add support for ~username syntax (fix #1033 ) (#1035 ) * Add support for ~username syntax (fix #1033) * Fixed return string Also removed non-descriptive variable name `foo` * moved err declarations outside of if statement	2018-03-30 16:20:51 -04:00
Zachary Yedidia	89f50638d7	Merge	2018-03-30 15:59:45 -04:00
Zachary Yedidia	c606c51c8b	Close fd properly in save Fixes #1057	2018-03-30 15:59:26 -04:00
Zachary Yedidia	4bde88d126	Merge pull request #1076 from Velocet/patch-1 Create PowerShell.yaml - PowerShell Syntax Highlighting	2018-03-20 23:22:51 -04:00
Velocet	41bae11c1e	Create PowerShell.yaml	2018-03-21 03:58:04 +01:00
Zachary Yedidia	f43a1b5ced	Merge pull request #1054 from jtolds/master allow optional brace matching with the closing brace to the left of the cursor	2018-03-19 00:32:26 -04:00
Zachary Yedidia	219f934656	Merge pull request #1067 from sum01/issue-1066 Fix #1066 php syntax	2018-03-19 00:32:07 -04:00
Zachary Yedidia	26da85dcb1	Fix test string formatting Fixes #1068	2018-03-09 00:39:59 -05:00
Zachary Yedidia	2885b42c62	Update fastdirty hash during save Fixes #1064	2018-03-08 15:07:14 -05:00
sum01	b12eca0a98	Fix #1066 php syntax	2018-03-08 11:28:38 -05:00
Zachary Yedidia	3e612d2597	Merge pull request #1045 from emilyaviva/master Organize colorscheme setting documentation	2018-03-02 20:12:46 -05:00
Zachary Yedidia	ade5efef5d	Merge pull request #1050 from mathieu-aubin/master raster compression	2018-03-02 20:11:50 -05:00
Zachary Yedidia	cb45481526	Make tab views array public Ref #1024	2018-03-02 19:50:33 -05:00
Zachary Yedidia	88d8b0b181	Count replacements in replaceall correctly Fixes #1055	2018-03-02 19:32:23 -05:00
JT Olds	ea6a87d41a	allow optionally brace matching with the closing brace to the left of the cursor this behavior, while slightly less obvious, allows for observing what brace you just closed. as you write closing braces, the brace you closed gets highlighted	2018-02-27 18:53:04 -07:00
Mathieu	1c2fd30cab	raster compression	2018-02-23 19:30:28 +01:00
Emily Aviva Kapor-Mater	69ed07cc62	Move setting instructions to top; add some minor organization	2018-02-20 12:11:31 -08:00
Zachary Yedidia	6d2cbb6cce	Use regexp replaceall Fixes #1038	2018-02-19 17:04:09 -05:00
Zachary Yedidia	397c29443a	Fix SaveAs Lua callback Fixes #1029	2018-02-12 00:06:31 -05:00
Zachary Yedidia	5b26702d5e	Merge pull request #1028 from filalex77/patch-1 Fix relative URL for terminfo	2018-02-09 11:07:14 -05:00
Oleksii Filonenko	b9e77eee6a	Fix relative URL for terminfo	2018-02-09 17:36:12 +02:00
Zachary Yedidia	8e5fd674cc	Merge	2018-02-08 14:18:04 -05:00
Zachary Yedidia	5038167650	Update clipboard	2018-02-08 14:17:58 -05:00
Zachary Yedidia	6787db9eb3	Merge pull request #1026 from mbesancon/patch-2 Update julia.yaml	2018-02-07 19:43:28 -05:00
mbesancon	75b9c8c1ec	Update julia.yaml added "import" keyword	2018-02-07 17:43:43 -05:00
Zachary Yedidia	a37c30b889	Fix resize when prompt is active Fixes #1020	2018-02-04 22:58:20 -05:00
Zachary Yedidia	f17b42bcd2	Update licenses	2018-02-04 14:04:42 -05:00
Zachary Yedidia	7bfc90d080	Update license info	2018-02-04 11:33:03 -05:00
Zachary Yedidia	1d24609ed1	Add goconvey dependency to vendor Ref #1	2018-02-03 22:33:32 -05:00
Zachary Yedidia	aa81cf5cf6	Support nano syntax for open at line Ref #887	2018-02-02 16:53:08 -05:00
Zachary Yedidia	4790c39dfc	Open at line syntax with filename:line:col Ref #1010 Ref #887 Ref #836	2018-02-02 13:57:30 -05:00
Zachary Yedidia	35a9245c5d	Use current view for every action Fixes #1015	2018-02-02 12:33:13 -05:00
Zachary Yedidia	3e3cdfc5b5	Fix minor issue with autoscroll Fixes #1012	2018-02-01 20:20:57 -05:00
Zachary Yedidia	f0e453b4f9	Improve ocaml syntax highlighting	2018-01-30 22:34:44 -05:00
Zachary Yedidia	3325b98063	Exit with error on screen initialization	2018-01-30 13:04:26 -05:00
Zachary Yedidia	4632c3594f	Fix bad import path	2018-01-29 23:42:45 -05:00
Zachary Yedidia	96c7b1d07b	Update to use new mkinfo from tcell This update incorporates the new terminfo updates in tcell into micro essentially merging zyedidia/mkinfo into micro. The zyedidia/mkinfo program should no longer be necessary and micro should automatically generate a tcell database on its own if it cannot find a terminal entry. The tcell database will be located in `configDir/.tcelldb`. Ref #20 Ref #922	2018-01-29 23:36:39 -05:00
Zachary Yedidia	f48116801b	Improve man page	2018-01-29 20:36:18 -05:00
Zachary Yedidia	aaf098bb47	Update tex syntax file	2018-01-29 18:02:43 -05:00
Zachary Yedidia	6d4134a178	Optimization to lots of redraws on large files	2018-01-29 16:47:55 -05:00
Zachary Yedidia	015fcf5fec	Minor optimizations	2018-01-29 16:02:15 -05:00
Zachary Yedidia	fddf1690e3	Large syntax highlighting memory optimization Ref #634	2018-01-29 15:21:00 -05:00
Zachary Yedidia	0913a1aeb3	Fix syntax highlighting on empty buffer	2018-01-28 22:35:43 -05:00
Zachary Yedidia	a19a6d28a7	Small simplification	2018-01-28 15:15:23 -05:00