Fix dropped redraw events (#1675 )

If screen.Redraw() is called very quickly after a key or mouse event, it may send the redraw event while micro is not waiting for it but still processing the key or mouse event. Since drawChan is non-buffered and at the same time non-blocking, this redraw event will be simply lost, so the screen content will not be up-to-date.
Merge branch 'master' of https://github.com/zyedidia/micro
2026-03-31 15:17:15 +09:00 · 2020-05-23 14:59:23 -04:00 · 2020-05-21 14:36:34 -04:00 · 2020-05-21 14:35:54 -04:00 · 2020-05-20 19:53:54 -04:00 · 2020-05-20 18:04:00 -04:00
70 changed files with 1100 additions and 674 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@ todo.txt
 test.txt
 log.txt
 *.old
+benchmark_results*
 tools/build-version
 tools/build-date
 tools/info-plist
--- a/20
+++ b/20
@@ -8,8 +8,8 @@ DATE = $(shell GOOS=$(shell go env GOHOSTOS) GOARCH=$(shell go env GOHOSTARCH) \
 ADDITIONAL_GO_LINKER_FLAGS = $(shell GOOS=$(shell go env GOHOSTOS) \
 	GOARCH=$(shell go env GOHOSTARCH))
 GOBIN ?= $(shell go env GOPATH)/bin
-GOVARS = -X github.com/zyedidia/micro/internal/util.Version=$(VERSION) -X github.com/zyedidia/micro/internal/util.CommitHash=$(HASH) -X 'github.com/zyedidia/micro/internal/util.CompileDate=$(DATE)'
-DEBUGVAR = -X github.com/zyedidia/micro/internal/util.Debug=ON
+GOVARS = -X github.com/zyedidia/micro/v2/internal/util.Version=$(VERSION) -X github.com/zyedidia/micro/v2/internal/util.CommitHash=$(HASH) -X 'github.com/zyedidia/micro/v2/internal/util.CompileDate=$(DATE)'
+DEBUGVAR = -X github.com/zyedidia/micro/v2/internal/util.Debug=ON
 VSCODE_TESTS_BASE_URL = 'https://raw.githubusercontent.com/microsoft/vscode/e6a45f4242ebddb7aa9a229f85555e8a3bd987e2/src/vs/editor/test/common/model/'

 # Builds micro after checking dependencies but without updating the runtime
@@ -65,7 +65,21 @@ test:
 	go test ./internal/...

 bench:
-	go test -bench=. ./internal/...
+	for i in 1 2 3; do \
+		go test -bench=. ./internal/...; \
+	done > benchmark_results
+	benchstat benchmark_results
+
+bench-baseline:
+	for i in 1 2 3; do \
+		go test -bench=. ./internal/...; \
+	done > benchmark_results_baseline
+
+bench-compare:
+	for i in 1 2 3; do \
+		go test -bench=. ./internal/...; \
+	done > benchmark_results
+	benchstat benchmark_results_baseline benchmark_results

 clean:
 	rm -f micro
--- a/README.md
+++ b/README.md
@@ -107,6 +107,10 @@ You can install micro using Homebrew on Mac:
 brew install micro
 ```

+**Note for Mac:** All micro keybindings use the control or alt (option) key, not the command
+key. By default, macOS terminals do not forward alt key events. To fix this, please see
+the section on [macOS terminals](https://github.com/zyedidia/micro#macos-terminal) further below.
+
 On Linux, you can install micro through [snap](https://snapcraft.io/docs/core/install)

 ```
@@ -120,6 +124,10 @@ via `apt`:
 sudo apt install micro
 ```

+**Note for Linux:** for interfacing with the local system clipboard, `xclip` or `xsel`
+must be installed. Please see the section on [Linux clipboard support](https://github.com/zyedidia/micro#linux-clipboard-support)
+further below.
+
 Micro is also available through other package managers on Linux such as AUR, Nix, and package managers
 for other operating systems:

--- a/cmd/micro/clean.go
+++ b/cmd/micro/clean.go
@@ -10,8 +10,8 @@ import (
 	"sort"
 	"strings"

-	"github.com/zyedidia/micro/internal/buffer"
-	"github.com/zyedidia/micro/internal/config"
+	"github.com/zyedidia/micro/v2/internal/buffer"
+	"github.com/zyedidia/micro/v2/internal/config"
 )

 func shouldContinue() bool {
--- a/cmd/micro/debug.go
+++ b/cmd/micro/debug.go
@@ -4,7 +4,7 @@ import (
 	"log"
 	"os"

-	"github.com/zyedidia/micro/internal/util"
+	"github.com/zyedidia/micro/v2/internal/util"
 )

 // NullWriter simply sends writes into the void
--- a/cmd/micro/initlua.go
+++ b/cmd/micro/initlua.go
@@ -6,14 +6,14 @@ import (
 	lua "github.com/yuin/gopher-lua"
 	luar "layeh.com/gopher-luar"

-	"github.com/zyedidia/micro/internal/action"
-	"github.com/zyedidia/micro/internal/buffer"
-	"github.com/zyedidia/micro/internal/config"
-	"github.com/zyedidia/micro/internal/display"
-	ulua "github.com/zyedidia/micro/internal/lua"
-	"github.com/zyedidia/micro/internal/screen"
-	"github.com/zyedidia/micro/internal/shell"
-	"github.com/zyedidia/micro/internal/util"
+	"github.com/zyedidia/micro/v2/internal/action"
+	"github.com/zyedidia/micro/v2/internal/buffer"
+	"github.com/zyedidia/micro/v2/internal/config"
+	"github.com/zyedidia/micro/v2/internal/display"
+	ulua "github.com/zyedidia/micro/v2/internal/lua"
+	"github.com/zyedidia/micro/v2/internal/screen"
+	"github.com/zyedidia/micro/v2/internal/shell"
+	"github.com/zyedidia/micro/v2/internal/util"
 )

 func init() {
@@ -141,6 +141,7 @@ func luaImportMicroUtil() *lua.LTable {
 	ulua.L.SetField(pkg, "GetLeadingWhitespace", luar.New(ulua.L, util.LuaGetLeadingWhitespace))
 	ulua.L.SetField(pkg, "IsWordChar", luar.New(ulua.L, util.LuaIsWordChar))
 	ulua.L.SetField(pkg, "String", luar.New(ulua.L, util.String))
+	ulua.L.SetField(pkg, "CharacterCountInString", luar.New(ulua.L, util.CharacterCountInString))
 	ulua.L.SetField(pkg, "RuneStr", luar.New(ulua.L, func(r rune) string {
 		return string(r)
 	}))
--- a/cmd/micro/micro.go
+++ b/cmd/micro/micro.go
@@ -13,12 +13,12 @@ import (
 	"github.com/go-errors/errors"
 	isatty "github.com/mattn/go-isatty"
 	lua "github.com/yuin/gopher-lua"
-	"github.com/zyedidia/micro/internal/action"
-	"github.com/zyedidia/micro/internal/buffer"
-	"github.com/zyedidia/micro/internal/config"
-	"github.com/zyedidia/micro/internal/screen"
-	"github.com/zyedidia/micro/internal/shell"
-	"github.com/zyedidia/micro/internal/util"
+	"github.com/zyedidia/micro/v2/internal/action"
+	"github.com/zyedidia/micro/v2/internal/buffer"
+	"github.com/zyedidia/micro/v2/internal/config"
+	"github.com/zyedidia/micro/v2/internal/screen"
+	"github.com/zyedidia/micro/v2/internal/shell"
+	"github.com/zyedidia/micro/v2/internal/util"
 	"github.com/zyedidia/tcell"
 )

@@ -363,6 +363,9 @@ func DoEvent() {
 	case <-shell.CloseTerms:
 	case event = <-events:
 	case <-screen.DrawChan():
+		for len(screen.DrawChan()) > 0 {
+			<-screen.DrawChan()
+		}
 	}

 	if action.InfoBar.HasPrompt {
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/zyedidia/micro
+module github.com/zyedidia/micro/v2

 require (
 	github.com/blang/semver v3.5.1+incompatible
@@ -12,12 +12,12 @@ require (
 	github.com/sergi/go-diff v1.1.0
 	github.com/stretchr/testify v1.4.0
 	github.com/yuin/gopher-lua v0.0.0-20191220021717-ab39c6098bdb
-	github.com/zyedidia/clipboard v0.0.0-20190823154308-241f98e9b197
+	github.com/zyedidia/clipboard v0.0.0-20200421031010-7c45b8673834
 	github.com/zyedidia/glob v0.0.0-20170209203856-dd4023a66dc3
 	github.com/zyedidia/highlight v0.0.0-20170330143449-201131ce5cf5
 	github.com/zyedidia/json5 v0.0.0-20200102012142-2da050b1a98d
 	github.com/zyedidia/pty v2.0.0+incompatible // indirect
-	github.com/zyedidia/tcell v1.4.4
+	github.com/zyedidia/tcell v1.4.5
 	github.com/zyedidia/terminal v0.0.0-20180726154117-533c623e2415
 	golang.org/x/text v0.3.2
 	gopkg.in/sourcemap.v1 v1.0.5 // indirect
--- a/go.sum
+++ b/go.sum
@@ -42,6 +42,8 @@ github.com/yuin/gopher-lua v0.0.0-20191220021717-ab39c6098bdb h1:ZkM6LRnq40pR1Ox
 github.com/yuin/gopher-lua v0.0.0-20191220021717-ab39c6098bdb/go.mod h1:gqRgreBUhTSL0GeU64rtZ3Uq3wtjOa/TB2YfrtkCbVQ=
 github.com/zyedidia/clipboard v0.0.0-20190823154308-241f98e9b197 h1:gYTNnAW6azuB3BbA6QYWO/H4F2ABSOjjw3Z03tlXd2c=
 github.com/zyedidia/clipboard v0.0.0-20190823154308-241f98e9b197/go.mod h1:WDk3p8GiZV9+xFWlSo8qreeoLhW6Ik692rqXk+cNeRY=
+github.com/zyedidia/clipboard v0.0.0-20200421031010-7c45b8673834 h1:0nOfq3JwYRiY3+nwfWVQYEaXDmGCQgj3RKoqTifLzP4=
+github.com/zyedidia/clipboard v0.0.0-20200421031010-7c45b8673834/go.mod h1:zykFnZUXX0ErxqvYLUFEq7QDJKId8rmh2FgD0/Y8cjA=
 github.com/zyedidia/glob v0.0.0-20170209203856-dd4023a66dc3 h1:oMHjjTLfGXVuyOQBYj5/td9WC0mw4g1xDBPovIqmHew=
 github.com/zyedidia/glob v0.0.0-20170209203856-dd4023a66dc3/go.mod h1:YKbIYP//Eln8eDgAJGI3IDvR3s4Tv9Z9TGIOumiyQ5c=
 github.com/zyedidia/highlight v0.0.0-20170330143449-201131ce5cf5 h1:Zs6mpwXvlqpF9zHl5XaN0p5V4J9XvP+WBuiuXyIgqvc=
@@ -54,6 +56,8 @@ github.com/zyedidia/pty v2.0.0+incompatible h1:Ou5vXL6tvjst+RV8sUFISbuKDnUJPhnpy
 github.com/zyedidia/pty v2.0.0+incompatible/go.mod h1:4y9l9yJZNxRa7GB/fB+mmDmGkG3CqmzLf4vUxGGotEA=
 github.com/zyedidia/tcell v1.4.4 h1:o34LXujNuSueuyTy+5eoQW+rQr8g0UbY8k1NczZyskQ=
 github.com/zyedidia/tcell v1.4.4/go.mod h1:HhlbMSCcGX15rFDB+Q1Lk3pKEOocsCUAQC3zhZ9sadA=
+github.com/zyedidia/tcell v1.4.5 h1:JFmOiWLxr3Fsk2vjRL3n8oRUoJeyrazGhkhZqW31kEY=
+github.com/zyedidia/tcell v1.4.5/go.mod h1:HhlbMSCcGX15rFDB+Q1Lk3pKEOocsCUAQC3zhZ9sadA=
 github.com/zyedidia/terminal v0.0.0-20180726154117-533c623e2415 h1:752dTQ5OatJ9M5ULK2+9lor+nzyZz+LYDo3WGngg3Rc=
 github.com/zyedidia/terminal v0.0.0-20180726154117-533c623e2415/go.mod h1:8leT8G0Cm8NoJHdrrKHyR9MirWoF4YW7pZh06B6H+1E=
 golang.org/x/sys v0.0.0-20190204203706-41f3e6584952/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
--- a/internal/action/actions.go
+++ b/internal/action/actions.go
@@ -5,15 +5,14 @@ import (
 	"runtime"
 	"strings"
 	"time"
-	"unicode/utf8"

 	shellquote "github.com/kballard/go-shellquote"
 	"github.com/zyedidia/clipboard"
-	"github.com/zyedidia/micro/internal/buffer"
-	"github.com/zyedidia/micro/internal/config"
-	"github.com/zyedidia/micro/internal/screen"
-	"github.com/zyedidia/micro/internal/shell"
-	"github.com/zyedidia/micro/internal/util"
+	"github.com/zyedidia/micro/v2/internal/buffer"
+	"github.com/zyedidia/micro/v2/internal/config"
+	"github.com/zyedidia/micro/v2/internal/screen"
+	"github.com/zyedidia/micro/v2/internal/shell"
+	"github.com/zyedidia/micro/v2/internal/util"
 	"github.com/zyedidia/tcell"
 )

@@ -175,7 +174,7 @@ func (h *BufPane) CursorRight() bool {
 		if tabstospaces && tabmovement {
 			tabsize := int(h.Buf.Settings["tabsize"].(float64))
 			line := h.Buf.LineBytes(h.Cursor.Y)
-			if h.Cursor.X+tabsize < utf8.RuneCount(line) && util.IsSpaces(line[h.Cursor.X:h.Cursor.X+tabsize]) && util.IsBytesWhitespace(line[0:h.Cursor.X]) {
+			if h.Cursor.X+tabsize < util.CharacterCount(line) && util.IsSpaces(line[h.Cursor.X:h.Cursor.X+tabsize]) && util.IsBytesWhitespace(line[0:h.Cursor.X]) {
 				for i := 0; i < tabsize; i++ {
 					h.Cursor.Right()
 				}
@@ -354,7 +353,6 @@ func (h *BufPane) SelectToStartOfTextToggle() bool {
 	return true
 }

-
 // SelectToStartOfLine selects to the start of the current line
 func (h *BufPane) SelectToStartOfLine() bool {
 	if !h.Cursor.HasSelection() {
@@ -487,7 +485,7 @@ func (h *BufPane) InsertNewline() bool {
 		// Remove the whitespaces if keepautoindent setting is off
 		if util.IsSpacesOrTabs(h.Buf.LineBytes(h.Cursor.Y-1)) && !h.Buf.Settings["keepautoindent"].(bool) {
 			line := h.Buf.LineBytes(h.Cursor.Y - 1)
-			h.Buf.Remove(buffer.Loc{X: 0, Y: h.Cursor.Y - 1}, buffer.Loc{X: utf8.RuneCount(line), Y: h.Cursor.Y - 1})
+			h.Buf.Remove(buffer.Loc{X: 0, Y: h.Cursor.Y - 1}, buffer.Loc{X: util.CharacterCount(line), Y: h.Cursor.Y - 1})
 		}
 	}
 	h.Cursor.LastVisualX = h.Cursor.GetVisualX()
@@ -512,7 +510,7 @@ func (h *BufPane) Backspace() bool {
 		// tab (tabSize number of spaces)
 		lineStart := util.SliceStart(h.Buf.LineBytes(h.Cursor.Y), h.Cursor.X)
 		tabSize := int(h.Buf.Settings["tabsize"].(float64))
-		if h.Buf.Settings["tabstospaces"].(bool) && util.IsSpaces(lineStart) && len(lineStart) != 0 && utf8.RuneCount(lineStart)%tabSize == 0 {
+		if h.Buf.Settings["tabstospaces"].(bool) && util.IsSpaces(lineStart) && len(lineStart) != 0 && util.CharacterCount(lineStart)%tabSize == 0 {
 			loc := h.Cursor.Loc
 			h.Buf.Remove(loc.Move(-tabSize, h.Buf), loc)
 		} else {
@@ -803,10 +801,23 @@ func (h *BufPane) saveBufToFile(filename string, action string, callback func())

 // Find opens a prompt and searches forward for the input
 func (h *BufPane) Find() bool {
+	return h.find(true)
+}
+
+// FindLiteral is the same as Find() but does not support regular expressions
+func (h *BufPane) FindLiteral() bool {
+	return h.find(false)
+}
+
+func (h *BufPane) find(useRegex bool) bool {
 	h.searchOrig = h.Cursor.Loc
-	InfoBar.Prompt("Find (regex): ", "", "Find", func(resp string) {
+	prompt := "Find: "
+	if useRegex {
+		prompt = "Find (regex): "
+	}
+	InfoBar.Prompt(prompt, "", "Find", func(resp string) {
 		// Event callback
-		match, found, _ := h.Buf.FindNext(resp, h.Buf.Start(), h.Buf.End(), h.searchOrig, true, true)
+		match, found, _ := h.Buf.FindNext(resp, h.Buf.Start(), h.Buf.End(), h.searchOrig, true, useRegex)
 		if found {
 			h.Cursor.SetSelectionStart(match[0])
 			h.Cursor.SetSelectionEnd(match[1])
@@ -821,7 +832,7 @@ func (h *BufPane) Find() bool {
 	}, func(resp string, canceled bool) {
 		// Finished callback
 		if !canceled {
-			match, found, err := h.Buf.FindNext(resp, h.Buf.Start(), h.Buf.End(), h.searchOrig, true, true)
+			match, found, err := h.Buf.FindNext(resp, h.Buf.Start(), h.Buf.End(), h.searchOrig, true, useRegex)
 			if err != nil {
 				InfoBar.Error(err)
 			}
@@ -832,6 +843,7 @@ func (h *BufPane) Find() bool {
 				h.Cursor.OrigSelection[1] = h.Cursor.CurSelection[1]
 				h.Cursor.GotoLoc(h.Cursor.CurSelection[1])
 				h.lastSearch = resp
+				h.lastSearchRegex = useRegex
 			} else {
 				h.Cursor.ResetSelection()
 				InfoBar.Message("No matches found")
@@ -855,7 +867,7 @@ func (h *BufPane) FindNext() bool {
 	if h.Cursor.HasSelection() {
 		searchLoc = h.Cursor.CurSelection[1]
 	}
-	match, found, err := h.Buf.FindNext(h.lastSearch, h.Buf.Start(), h.Buf.End(), searchLoc, true, true)
+	match, found, err := h.Buf.FindNext(h.lastSearch, h.Buf.Start(), h.Buf.End(), searchLoc, true, h.lastSearchRegex)
 	if err != nil {
 		InfoBar.Error(err)
 	}
@@ -882,7 +894,7 @@ func (h *BufPane) FindPrevious() bool {
 	if h.Cursor.HasSelection() {
 		searchLoc = h.Cursor.CurSelection[0]
 	}
-	match, found, err := h.Buf.FindNext(h.lastSearch, h.Buf.Start(), h.Buf.End(), searchLoc, false, true)
+	match, found, err := h.Buf.FindNext(h.lastSearch, h.Buf.Start(), h.Buf.End(), searchLoc, false, h.lastSearchRegex)
 	if err != nil {
 		InfoBar.Error(err)
 	}
@@ -930,6 +942,25 @@ func (h *BufPane) Copy() bool {
 	return true
 }

+// Copy the current line to the clipboard
+func (h *BufPane) CopyLine() bool {
+	if h.Cursor.HasSelection() {
+		return false
+	} else {
+		h.Cursor.SelectLine()
+		h.Cursor.CopySelection("clipboard")
+		h.freshClip = true
+		if clipboard.Unsupported {
+			InfoBar.Message("Copied line (install xclip for external clipboard)")
+		} else {
+			InfoBar.Message("Copied line")
+		}
+	}
+	h.Cursor.Deselect(true)
+	h.Relocate()
+	return true
+}
+
 // CutLine cuts the current line to the clipboard
 func (h *BufPane) CutLine() bool {
 	h.Cursor.SelectLine()
@@ -1009,15 +1040,26 @@ func (h *BufPane) MoveLinesUp() bool {
 		}
 		start := h.Cursor.CurSelection[0].Y
 		end := h.Cursor.CurSelection[1].Y
+		sel := 1
 		if start > end {
 			end, start = start, end
+			sel = 0
+		}
+
+		compensate := false
+		if h.Cursor.CurSelection[sel].X != 0 {
+			end++
+		} else {
+			compensate = true
 		}

 		h.Buf.MoveLinesUp(
 			start,
 			end,
 		)
-		h.Cursor.CurSelection[1].Y -= 1
+		if compensate {
+			h.Cursor.CurSelection[sel].Y -= 1
+		}
 	} else {
 		if h.Cursor.Loc.Y == 0 {
 			InfoBar.Message("Cannot move further up")
@@ -1042,8 +1084,14 @@ func (h *BufPane) MoveLinesDown() bool {
 		}
 		start := h.Cursor.CurSelection[0].Y
 		end := h.Cursor.CurSelection[1].Y
+		sel := 1
 		if start > end {
 			end, start = start, end
+			sel = 0
+		}
+
+		if h.Cursor.CurSelection[sel].X != 0 {
+			end++
 		}

 		h.Buf.MoveLinesDown(
@@ -1447,8 +1495,9 @@ func (h *BufPane) AddTab() bool {

 // PreviousTab switches to the previous tab in the tab list
 func (h *BufPane) PreviousTab() bool {
-	a := Tabs.Active()
-	Tabs.SetActive(util.Clamp(a-1, 0, len(Tabs.List)-1))
+	tabsLen := len(Tabs.List)
+	a := Tabs.Active() + tabsLen
+	Tabs.SetActive((a - 1) % tabsLen)

 	return true
 }
@@ -1456,7 +1505,8 @@ func (h *BufPane) PreviousTab() bool {
 // NextTab switches to the next tab in the tab list
 func (h *BufPane) NextTab() bool {
 	a := Tabs.Active()
-	Tabs.SetActive(util.Clamp(a+1, 0, len(Tabs.List)-1))
+	Tabs.SetActive((a + 1) % len(Tabs.List))
+
 	return true
 }

--- a/internal/action/actions_posix.go
+++ b/internal/action/actions_posix.go
@@ -5,7 +5,7 @@ package action
 import (
 	"syscall"

-	"github.com/zyedidia/micro/internal/screen"
+	"github.com/zyedidia/micro/v2/internal/screen"
 )

 // Suspend sends micro to the background. This is the same as pressing CtrlZ in most unix programs.
--- a/internal/action/bindings.go
+++ b/internal/action/bindings.go
@@ -10,8 +10,8 @@ import (
 	"unicode"

 	"github.com/zyedidia/json5"
-	"github.com/zyedidia/micro/internal/config"
-	"github.com/zyedidia/micro/internal/screen"
+	"github.com/zyedidia/micro/v2/internal/config"
+	"github.com/zyedidia/micro/v2/internal/screen"
 	"github.com/zyedidia/tcell"
 )

@@ -249,6 +249,7 @@ func UnbindKey(k string) error {
 		if a, ok := defaults[k]; ok {
 			BindKey(k, a)
 		} else if _, ok := config.Bindings[k]; ok {
+			BufUnmap(key)
 			delete(config.Bindings, k)
 		}

--- a/internal/action/bufpane.go
+++ b/internal/action/bufpane.go
@@ -7,11 +7,11 @@ import (
 	luar "layeh.com/gopher-luar"

 	lua "github.com/yuin/gopher-lua"
-	"github.com/zyedidia/micro/internal/buffer"
-	"github.com/zyedidia/micro/internal/config"
-	"github.com/zyedidia/micro/internal/display"
-	ulua "github.com/zyedidia/micro/internal/lua"
-	"github.com/zyedidia/micro/internal/screen"
+	"github.com/zyedidia/micro/v2/internal/buffer"
+	"github.com/zyedidia/micro/v2/internal/config"
+	"github.com/zyedidia/micro/v2/internal/display"
+	ulua "github.com/zyedidia/micro/v2/internal/lua"
+	"github.com/zyedidia/micro/v2/internal/screen"
 	"github.com/zyedidia/tcell"
 )

@@ -103,7 +103,7 @@ func BufMapKey(k Event, action string) {
 			afn = f
 			names = append(names, a)
 		} else {
-			screen.TermMessage("Error:", a, "does not exist")
+			screen.TermMessage("Error in bindings: action", a, "does not exist")
 			continue
 		}
 		actionfns = append(actionfns, afn)
@@ -139,6 +139,17 @@ func BufMapMouse(k MouseEvent, action string) {
 	}
 }

+// BufUnmap unmaps a key or mouse event from any action
+func BufUnmap(k Event) {
+	delete(BufKeyBindings, k)
+	delete(BufKeyStrings, k)
+
+	switch e := k.(type) {
+	case MouseEvent:
+		delete(BufMouseBindings, e)
+	}
+}
+
 // The BufPane connects the buffer and the window
 // It provides a cursor (or multiple) and defines a set of actions
 // that can be taken on the buffer
@@ -179,7 +190,8 @@ type BufPane struct {
 	tripleClick bool

 	// Last search stores the last successful search for FindNext and FindPrev
-	lastSearch string
+	lastSearch      string
+	lastSearchRegex bool
 	// Should the current multiple cursor selection search based on word or
 	// based on selection (false for selection, true for word)
 	multiWord bool
@@ -517,112 +529,114 @@ func (h *BufPane) SetActive(b bool) {

 // BufKeyActions contains the list of all possible key actions the bufhandler could execute
 var BufKeyActions = map[string]BufKeyAction{
-	"CursorUp":                 (*BufPane).CursorUp,
-	"CursorDown":               (*BufPane).CursorDown,
-	"CursorPageUp":             (*BufPane).CursorPageUp,
-	"CursorPageDown":           (*BufPane).CursorPageDown,
-	"CursorLeft":               (*BufPane).CursorLeft,
-	"CursorRight":              (*BufPane).CursorRight,
-	"CursorStart":              (*BufPane).CursorStart,
-	"CursorEnd":                (*BufPane).CursorEnd,
-	"SelectToStart":            (*BufPane).SelectToStart,
-	"SelectToEnd":              (*BufPane).SelectToEnd,
-	"SelectUp":                 (*BufPane).SelectUp,
-	"SelectDown":               (*BufPane).SelectDown,
-	"SelectLeft":               (*BufPane).SelectLeft,
-	"SelectRight":              (*BufPane).SelectRight,
-	"WordRight":                (*BufPane).WordRight,
-	"WordLeft":                 (*BufPane).WordLeft,
-	"SelectWordRight":          (*BufPane).SelectWordRight,
-	"SelectWordLeft":           (*BufPane).SelectWordLeft,
-	"DeleteWordRight":          (*BufPane).DeleteWordRight,
-	"DeleteWordLeft":           (*BufPane).DeleteWordLeft,
-	"SelectLine":               (*BufPane).SelectLine,
-	"SelectToStartOfLine":      (*BufPane).SelectToStartOfLine,
-	"SelectToStartOfText":      (*BufPane).SelectToStartOfText,
-	"SelectToStartOfTextToggle":(*BufPane).SelectToStartOfTextToggle,
-	"SelectToEndOfLine":        (*BufPane).SelectToEndOfLine,
-	"ParagraphPrevious":        (*BufPane).ParagraphPrevious,
-	"ParagraphNext":            (*BufPane).ParagraphNext,
-	"InsertNewline":            (*BufPane).InsertNewline,
-	"Backspace":                (*BufPane).Backspace,
-	"Delete":                   (*BufPane).Delete,
-	"InsertTab":                (*BufPane).InsertTab,
-	"Save":                     (*BufPane).Save,
-	"SaveAll":                  (*BufPane).SaveAll,
-	"SaveAs":                   (*BufPane).SaveAs,
-	"Find":                     (*BufPane).Find,
-	"FindNext":                 (*BufPane).FindNext,
-	"FindPrevious":             (*BufPane).FindPrevious,
-	"Center":                   (*BufPane).Center,
-	"Undo":                     (*BufPane).Undo,
-	"Redo":                     (*BufPane).Redo,
-	"Copy":                     (*BufPane).Copy,
-	"Cut":                      (*BufPane).Cut,
-	"CutLine":                  (*BufPane).CutLine,
-	"DuplicateLine":            (*BufPane).DuplicateLine,
-	"DeleteLine":               (*BufPane).DeleteLine,
-	"MoveLinesUp":              (*BufPane).MoveLinesUp,
-	"MoveLinesDown":            (*BufPane).MoveLinesDown,
-	"IndentSelection":          (*BufPane).IndentSelection,
-	"OutdentSelection":         (*BufPane).OutdentSelection,
-	"Autocomplete":             (*BufPane).Autocomplete,
-	"CycleAutocompleteBack":    (*BufPane).CycleAutocompleteBack,
-	"OutdentLine":              (*BufPane).OutdentLine,
-	"IndentLine":               (*BufPane).IndentLine,
-	"Paste":                    (*BufPane).Paste,
-	"PastePrimary":             (*BufPane).PastePrimary,
-	"SelectAll":                (*BufPane).SelectAll,
-	"OpenFile":                 (*BufPane).OpenFile,
-	"Start":                    (*BufPane).Start,
-	"End":                      (*BufPane).End,
-	"PageUp":                   (*BufPane).PageUp,
-	"PageDown":                 (*BufPane).PageDown,
-	"SelectPageUp":             (*BufPane).SelectPageUp,
-	"SelectPageDown":           (*BufPane).SelectPageDown,
-	"HalfPageUp":               (*BufPane).HalfPageUp,
-	"HalfPageDown":             (*BufPane).HalfPageDown,
-	"StartOfText":              (*BufPane).StartOfText,
-	"StartOfTextToggle":        (*BufPane).StartOfTextToggle,
-	"StartOfLine":              (*BufPane).StartOfLine,
-	"EndOfLine":                (*BufPane).EndOfLine,
-	"ToggleHelp":               (*BufPane).ToggleHelp,
-	"ToggleKeyMenu":            (*BufPane).ToggleKeyMenu,
-	"ToggleDiffGutter":         (*BufPane).ToggleDiffGutter,
-	"ToggleRuler":              (*BufPane).ToggleRuler,
-	"ClearStatus":              (*BufPane).ClearStatus,
-	"ShellMode":                (*BufPane).ShellMode,
-	"CommandMode":              (*BufPane).CommandMode,
-	"ToggleOverwriteMode":      (*BufPane).ToggleOverwriteMode,
-	"Escape":                   (*BufPane).Escape,
-	"Quit":                     (*BufPane).Quit,
-	"QuitAll":                  (*BufPane).QuitAll,
-	"AddTab":                   (*BufPane).AddTab,
-	"PreviousTab":              (*BufPane).PreviousTab,
-	"NextTab":                  (*BufPane).NextTab,
-	"NextSplit":                (*BufPane).NextSplit,
-	"PreviousSplit":            (*BufPane).PreviousSplit,
-	"Unsplit":                  (*BufPane).Unsplit,
-	"VSplit":                   (*BufPane).VSplitAction,
-	"HSplit":                   (*BufPane).HSplitAction,
-	"ToggleMacro":              (*BufPane).ToggleMacro,
-	"PlayMacro":                (*BufPane).PlayMacro,
-	"Suspend":                  (*BufPane).Suspend,
-	"ScrollUp":                 (*BufPane).ScrollUpAction,
-	"ScrollDown":               (*BufPane).ScrollDownAction,
-	"SpawnMultiCursor":         (*BufPane).SpawnMultiCursor,
-	"SpawnMultiCursorUp":       (*BufPane).SpawnMultiCursorUp,
-	"SpawnMultiCursorDown":     (*BufPane).SpawnMultiCursorDown,
-	"SpawnMultiCursorSelect":   (*BufPane).SpawnMultiCursorSelect,
-	"RemoveMultiCursor":        (*BufPane).RemoveMultiCursor,
-	"RemoveAllMultiCursors":    (*BufPane).RemoveAllMultiCursors,
-	"SkipMultiCursor":          (*BufPane).SkipMultiCursor,
-	"JumpToMatchingBrace":      (*BufPane).JumpToMatchingBrace,
-	"JumpLine":                 (*BufPane).JumpLine,
-	"None":                     (*BufPane).None,
+	"CursorUp":                  (*BufPane).CursorUp,
+	"CursorDown":                (*BufPane).CursorDown,
+	"CursorPageUp":              (*BufPane).CursorPageUp,
+	"CursorPageDown":            (*BufPane).CursorPageDown,
+	"CursorLeft":                (*BufPane).CursorLeft,
+	"CursorRight":               (*BufPane).CursorRight,
+	"CursorStart":               (*BufPane).CursorStart,
+	"CursorEnd":                 (*BufPane).CursorEnd,
+	"SelectToStart":             (*BufPane).SelectToStart,
+	"SelectToEnd":               (*BufPane).SelectToEnd,
+	"SelectUp":                  (*BufPane).SelectUp,
+	"SelectDown":                (*BufPane).SelectDown,
+	"SelectLeft":                (*BufPane).SelectLeft,
+	"SelectRight":               (*BufPane).SelectRight,
+	"WordRight":                 (*BufPane).WordRight,
+	"WordLeft":                  (*BufPane).WordLeft,
+	"SelectWordRight":           (*BufPane).SelectWordRight,
+	"SelectWordLeft":            (*BufPane).SelectWordLeft,
+	"DeleteWordRight":           (*BufPane).DeleteWordRight,
+	"DeleteWordLeft":            (*BufPane).DeleteWordLeft,
+	"SelectLine":                (*BufPane).SelectLine,
+	"SelectToStartOfLine":       (*BufPane).SelectToStartOfLine,
+	"SelectToStartOfText":       (*BufPane).SelectToStartOfText,
+	"SelectToStartOfTextToggle": (*BufPane).SelectToStartOfTextToggle,
+	"SelectToEndOfLine":         (*BufPane).SelectToEndOfLine,
+	"ParagraphPrevious":         (*BufPane).ParagraphPrevious,
+	"ParagraphNext":             (*BufPane).ParagraphNext,
+	"InsertNewline":             (*BufPane).InsertNewline,
+	"Backspace":                 (*BufPane).Backspace,
+	"Delete":                    (*BufPane).Delete,
+	"InsertTab":                 (*BufPane).InsertTab,
+	"Save":                      (*BufPane).Save,
+	"SaveAll":                   (*BufPane).SaveAll,
+	"SaveAs":                    (*BufPane).SaveAs,
+	"Find":                      (*BufPane).Find,
+	"FindLiteral":               (*BufPane).FindLiteral,
+	"FindNext":                  (*BufPane).FindNext,
+	"FindPrevious":              (*BufPane).FindPrevious,
+	"Center":                    (*BufPane).Center,
+	"Undo":                      (*BufPane).Undo,
+	"Redo":                      (*BufPane).Redo,
+	"Copy":                      (*BufPane).Copy,
+	"CopyLine":                  (*BufPane).CopyLine,
+	"Cut":                       (*BufPane).Cut,
+	"CutLine":                   (*BufPane).CutLine,
+	"DuplicateLine":             (*BufPane).DuplicateLine,
+	"DeleteLine":                (*BufPane).DeleteLine,
+	"MoveLinesUp":               (*BufPane).MoveLinesUp,
+	"MoveLinesDown":             (*BufPane).MoveLinesDown,
+	"IndentSelection":           (*BufPane).IndentSelection,
+	"OutdentSelection":          (*BufPane).OutdentSelection,
+	"Autocomplete":              (*BufPane).Autocomplete,
+	"CycleAutocompleteBack":     (*BufPane).CycleAutocompleteBack,
+	"OutdentLine":               (*BufPane).OutdentLine,
+	"IndentLine":                (*BufPane).IndentLine,
+	"Paste":                     (*BufPane).Paste,
+	"PastePrimary":              (*BufPane).PastePrimary,
+	"SelectAll":                 (*BufPane).SelectAll,
+	"OpenFile":                  (*BufPane).OpenFile,
+	"Start":                     (*BufPane).Start,
+	"End":                       (*BufPane).End,
+	"PageUp":                    (*BufPane).PageUp,
+	"PageDown":                  (*BufPane).PageDown,
+	"SelectPageUp":              (*BufPane).SelectPageUp,
+	"SelectPageDown":            (*BufPane).SelectPageDown,
+	"HalfPageUp":                (*BufPane).HalfPageUp,
+	"HalfPageDown":              (*BufPane).HalfPageDown,
+	"StartOfText":               (*BufPane).StartOfText,
+	"StartOfTextToggle":         (*BufPane).StartOfTextToggle,
+	"StartOfLine":               (*BufPane).StartOfLine,
+	"EndOfLine":                 (*BufPane).EndOfLine,
+	"ToggleHelp":                (*BufPane).ToggleHelp,
+	"ToggleKeyMenu":             (*BufPane).ToggleKeyMenu,
+	"ToggleDiffGutter":          (*BufPane).ToggleDiffGutter,
+	"ToggleRuler":               (*BufPane).ToggleRuler,
+	"ClearStatus":               (*BufPane).ClearStatus,
+	"ShellMode":                 (*BufPane).ShellMode,
+	"CommandMode":               (*BufPane).CommandMode,
+	"ToggleOverwriteMode":       (*BufPane).ToggleOverwriteMode,
+	"Escape":                    (*BufPane).Escape,
+	"Quit":                      (*BufPane).Quit,
+	"QuitAll":                   (*BufPane).QuitAll,
+	"AddTab":                    (*BufPane).AddTab,
+	"PreviousTab":               (*BufPane).PreviousTab,
+	"NextTab":                   (*BufPane).NextTab,
+	"NextSplit":                 (*BufPane).NextSplit,
+	"PreviousSplit":             (*BufPane).PreviousSplit,
+	"Unsplit":                   (*BufPane).Unsplit,
+	"VSplit":                    (*BufPane).VSplitAction,
+	"HSplit":                    (*BufPane).HSplitAction,
+	"ToggleMacro":               (*BufPane).ToggleMacro,
+	"PlayMacro":                 (*BufPane).PlayMacro,
+	"Suspend":                   (*BufPane).Suspend,
+	"ScrollUp":                  (*BufPane).ScrollUpAction,
+	"ScrollDown":                (*BufPane).ScrollDownAction,
+	"SpawnMultiCursor":          (*BufPane).SpawnMultiCursor,
+	"SpawnMultiCursorUp":        (*BufPane).SpawnMultiCursorUp,
+	"SpawnMultiCursorDown":      (*BufPane).SpawnMultiCursorDown,
+	"SpawnMultiCursorSelect":    (*BufPane).SpawnMultiCursorSelect,
+	"RemoveMultiCursor":         (*BufPane).RemoveMultiCursor,
+	"RemoveAllMultiCursors":     (*BufPane).RemoveAllMultiCursors,
+	"SkipMultiCursor":           (*BufPane).SkipMultiCursor,
+	"JumpToMatchingBrace":       (*BufPane).JumpToMatchingBrace,
+	"JumpLine":                  (*BufPane).JumpLine,
+	"None":                      (*BufPane).None,

 	// This was changed to InsertNewline but I don't want to break backwards compatibility
-	"InsertEnter":              (*BufPane).InsertNewline,
+	"InsertEnter": (*BufPane).InsertNewline,
 }

 // BufMouseActions contains the list of all possible mouse actions the bufhandler could execute
@@ -669,6 +683,7 @@ var MultiActions = map[string]bool{
 	"InsertTab":                 true,
 	"FindNext":                  true,
 	"FindPrevious":              true,
+	"CopyLine":                  true,
 	"Cut":                       true,
 	"CutLine":                   true,
 	"DuplicateLine":             true,
--- a/internal/action/command.go
+++ b/internal/action/command.go
@@ -10,14 +10,13 @@ import (
 	"regexp"
 	"strconv"
 	"strings"
-	"unicode/utf8"

 	shellquote "github.com/kballard/go-shellquote"
-	"github.com/zyedidia/micro/internal/buffer"
-	"github.com/zyedidia/micro/internal/config"
-	"github.com/zyedidia/micro/internal/screen"
-	"github.com/zyedidia/micro/internal/shell"
-	"github.com/zyedidia/micro/internal/util"
+	"github.com/zyedidia/micro/v2/internal/buffer"
+	"github.com/zyedidia/micro/v2/internal/config"
+	"github.com/zyedidia/micro/v2/internal/screen"
+	"github.com/zyedidia/micro/v2/internal/shell"
+	"github.com/zyedidia/micro/v2/internal/util"
 )

 // A Command contains information about how to execute a command
@@ -56,6 +55,7 @@ func InitCommands() {
 		"cd":         {(*BufPane).CdCmd, buffer.FileComplete},
 		"pwd":        {(*BufPane).PwdCmd, nil},
 		"open":       {(*BufPane).OpenCmd, buffer.FileComplete},
+		"tabmove":    {(*BufPane).TabMoveCmd, nil},
 		"tabswitch":  {(*BufPane).TabSwitchCmd, nil},
 		"term":       {(*BufPane).TermCmd, nil},
 		"memusage":   {(*BufPane).MemUsageCmd, nil},
@@ -155,6 +155,56 @@ func (h *BufPane) TextFilterCmd(args []string) {
 	h.Buf.Insert(h.Cursor.Loc, bout.String())
 }

+// TabMoveCmd moves the current tab to a given index (starts at 1). The
+// displaced tabs are moved up.
+func (h *BufPane) TabMoveCmd(args []string) {
+	if len(args) <= 0 {
+		InfoBar.Error("Not enough arguments: provide an index, starting at 1")
+		return
+	}
+
+	if len(args[0]) <= 0 {
+		InfoBar.Error("Invalid argument: empty string")
+		return
+	}
+
+	num, err := strconv.Atoi(args[0])
+	if err != nil {
+		InfoBar.Error("Invalid argument: ", err)
+		return
+	}
+
+	// Preserve sign for relative move, if one exists
+	var shiftDirection byte
+	if strings.Contains("-+", string([]byte{args[0][0]})) {
+		shiftDirection = args[0][0]
+	}
+
+	// Relative positions -> absolute positions
+	idxFrom := Tabs.Active()
+	idxTo := 0
+	offset := util.Abs(num)
+	if shiftDirection == '-' {
+		idxTo = idxFrom - offset
+	} else if shiftDirection == '+' {
+		idxTo = idxFrom + offset
+	} else {
+		idxTo = offset - 1
+	}
+
+	// Restrain position to within the valid range
+	idxTo = util.Clamp(idxTo, 0, len(Tabs.List)-1)
+
+	activeTab := Tabs.List[idxFrom]
+	Tabs.RemoveTab(activeTab.ID())
+	Tabs.List = append(Tabs.List, nil)
+	copy(Tabs.List[idxTo+1:], Tabs.List[idxTo:])
+	Tabs.List[idxTo] = activeTab
+	Tabs.UpdateNames()
+	Tabs.SetActive(idxTo)
+	// InfoBar.Message(fmt.Sprintf("Moved tab from slot %d to %d", idxFrom+1, idxTo+1))
+}
+
 // TabSwitchCmd switches to a given tab either by name or by number
 func (h *BufPane) TabSwitchCmd(args []string) {
 	if len(args) > 0 {
@@ -652,7 +702,7 @@ func (h *BufPane) GotoCmd(args []string) {
 				return
 			}
 			line = util.Clamp(line-1, 0, h.Buf.LinesNum()-1)
-			col = util.Clamp(col-1, 0, utf8.RuneCount(h.Buf.LineBytes(line)))
+			col = util.Clamp(col-1, 0, util.CharacterCount(h.Buf.LineBytes(line)))
 			h.Cursor.GotoLoc(buffer.Loc{col, line})
 		} else {
 			line, err := strconv.Atoi(args[0])
@@ -761,6 +811,7 @@ func (h *BufPane) ReplaceCmd(args []string) {

 			h.Cursor.SetSelectionStart(locs[0])
 			h.Cursor.SetSelectionEnd(locs[1])
+			h.Cursor.GotoLoc(locs[0])

 			h.Relocate()

@@ -775,7 +826,7 @@ func (h *BufPane) ReplaceCmd(args []string) {
 					nreplaced++
 				} else if !canceled && !yes {
 					searchLoc = locs[0]
-					searchLoc.X += utf8.RuneCount(replace)
+					searchLoc.X += util.CharacterCount(replace)
 				} else if canceled {
 					h.Cursor.ResetSelection()
 					h.Buf.RelocateCursors()
--- a/internal/action/defaults_darwin.go
+++ b/internal/action/defaults_darwin.go
@@ -43,7 +43,7 @@ func DefaultBindings() map[string]string {
 		"CtrlP":          "FindPrevious",
 		"CtrlZ":          "Undo",
 		"CtrlY":          "Redo",
-		"CtrlC":          "Copy",
+		"CtrlC":          "CopyLine|Copy",
 		"CtrlX":          "Cut",
 		"CtrlK":          "CutLine",
 		"CtrlD":          "DuplicateLine",
--- a/internal/action/defaults_other.go
+++ b/internal/action/defaults_other.go
@@ -45,7 +45,7 @@ func DefaultBindings() map[string]string {
 		"CtrlP":          "FindPrevious",
 		"CtrlZ":          "Undo",
 		"CtrlY":          "Redo",
-		"CtrlC":          "Copy",
+		"CtrlC":          "CopyLine|Copy",
 		"CtrlX":          "Cut",
 		"CtrlK":          "CutLine",
 		"CtrlD":          "DuplicateLine",
--- a/internal/action/globals.go
+++ b/internal/action/globals.go
@@ -1,6 +1,6 @@
 package action

-import "github.com/zyedidia/micro/internal/buffer"
+import "github.com/zyedidia/micro/v2/internal/buffer"

 var InfoBar *InfoPane
 var LogBufPane *BufPane
--- a/internal/action/infocomplete.go
+++ b/internal/action/infocomplete.go
@@ -5,9 +5,9 @@ import (
 	"sort"
 	"strings"

-	"github.com/zyedidia/micro/internal/buffer"
-	"github.com/zyedidia/micro/internal/config"
-	"github.com/zyedidia/micro/internal/util"
+	"github.com/zyedidia/micro/v2/internal/buffer"
+	"github.com/zyedidia/micro/v2/internal/config"
+	"github.com/zyedidia/micro/v2/internal/util"
 )

 // This file is meant (for now) for autocompletion in command mode, not
--- a/internal/action/infopane.go
+++ b/internal/action/infopane.go
@@ -4,10 +4,10 @@ import (
 	"bytes"
 	"strings"

-	"github.com/zyedidia/micro/internal/buffer"
-	"github.com/zyedidia/micro/internal/display"
-	"github.com/zyedidia/micro/internal/info"
-	"github.com/zyedidia/micro/internal/util"
+	"github.com/zyedidia/micro/v2/internal/buffer"
+	"github.com/zyedidia/micro/v2/internal/display"
+	"github.com/zyedidia/micro/v2/internal/info"
+	"github.com/zyedidia/micro/v2/internal/util"
 	"github.com/zyedidia/tcell"
 )

--- a/internal/action/pane.go
+++ b/internal/action/pane.go
@@ -1,7 +1,7 @@
 package action

 import (
-	"github.com/zyedidia/micro/internal/display"
+	"github.com/zyedidia/micro/v2/internal/display"
 )

 type Pane interface {
--- a/internal/action/rawpane.go
+++ b/internal/action/rawpane.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"reflect"

-	"github.com/zyedidia/micro/internal/buffer"
-	"github.com/zyedidia/micro/internal/display"
+	"github.com/zyedidia/micro/v2/internal/buffer"
+	"github.com/zyedidia/micro/v2/internal/display"
 	"github.com/zyedidia/tcell"
 )

--- a/internal/action/tab.go
+++ b/internal/action/tab.go
@@ -1,11 +1,11 @@
 package action

 import (
-	"github.com/zyedidia/micro/internal/buffer"
-	"github.com/zyedidia/micro/internal/config"
-	"github.com/zyedidia/micro/internal/display"
-	"github.com/zyedidia/micro/internal/screen"
-	"github.com/zyedidia/micro/internal/views"
+	"github.com/zyedidia/micro/v2/internal/buffer"
+	"github.com/zyedidia/micro/v2/internal/config"
+	"github.com/zyedidia/micro/v2/internal/display"
+	"github.com/zyedidia/micro/v2/internal/screen"
+	"github.com/zyedidia/micro/v2/internal/views"
 	"github.com/zyedidia/tcell"
 )

--- a/internal/action/terminal_supported.go
+++ b/internal/action/terminal_supported.go
@@ -4,7 +4,7 @@ package action

 import (
 	shellquote "github.com/kballard/go-shellquote"
-	"github.com/zyedidia/micro/internal/shell"
+	"github.com/zyedidia/micro/v2/internal/shell"
 )

 // TermEmuSupported is a constant that marks if the terminal emulator is supported
--- a/internal/action/termpane.go
+++ b/internal/action/termpane.go
@@ -5,9 +5,9 @@ import (
 	"runtime"

 	"github.com/zyedidia/clipboard"
-	"github.com/zyedidia/micro/internal/display"
-	"github.com/zyedidia/micro/internal/screen"
-	"github.com/zyedidia/micro/internal/shell"
+	"github.com/zyedidia/micro/v2/internal/display"
+	"github.com/zyedidia/micro/v2/internal/screen"
+	"github.com/zyedidia/micro/v2/internal/shell"
 	"github.com/zyedidia/tcell"
 	"github.com/zyedidia/terminal"
 )
--- a/internal/buffer/autocomplete.go
+++ b/internal/buffer/autocomplete.go
@@ -6,9 +6,8 @@ import (
 	"os"
 	"sort"
 	"strings"
-	"unicode/utf8"

-	"github.com/zyedidia/micro/internal/util"
+	"github.com/zyedidia/micro/v2/internal/util"
 )

 // A Completer is a function that takes a buffer and returns info
@@ -54,7 +53,7 @@ func (b *Buffer) CycleAutocomplete(forward bool) {
 	start := c.Loc
 	end := c.Loc
 	if prevSuggestion < len(b.Suggestions) && prevSuggestion >= 0 {
-		start = end.Move(-utf8.RuneCountInString(b.Completions[prevSuggestion]), b)
+		start = end.Move(-util.CharacterCountInString(b.Completions[prevSuggestion]), b)
 	} else {
 		// end = start.Move(1, b)
 	}
@@ -82,7 +81,7 @@ func GetWord(b *Buffer) ([]byte, int) {

 	args := bytes.FieldsFunc(l, util.IsNonAlphaNumeric)
 	input := args[len(args)-1]
-	return input, c.X - utf8.RuneCount(input)
+	return input, c.X - util.CharacterCount(input)
 }

 // GetArg gets the most recent word (separated by ' ' only)
@@ -98,7 +97,7 @@ func GetArg(b *Buffer) (string, int) {
 		if i == len(args)-1 {
 			break
 		}
-		argstart += utf8.RuneCount(a) + 1
+		argstart += util.CharacterCount(a) + 1
 	}

 	return input, argstart
@@ -162,7 +161,7 @@ func BufferComplete(b *Buffer) ([]string, []string) {
 		return []string{}, []string{}
 	}

-	inputLen := utf8.RuneCount(input)
+	inputLen := util.CharacterCount(input)

 	suggestionsSet := make(map[string]struct{})

@@ -171,7 +170,7 @@ func BufferComplete(b *Buffer) ([]string, []string) {
 		l := b.LineBytes(i)
 		words := bytes.FieldsFunc(l, util.IsNonAlphaNumeric)
 		for _, w := range words {
-			if bytes.HasPrefix(w, input) && utf8.RuneCount(w) > inputLen {
+			if bytes.HasPrefix(w, input) && util.CharacterCount(w) > inputLen {
 				strw := string(w)
 				if _, ok := suggestionsSet[strw]; !ok {
 					suggestionsSet[strw] = struct{}{}
@@ -184,7 +183,7 @@ func BufferComplete(b *Buffer) ([]string, []string) {
 		l := b.LineBytes(i)
 		words := bytes.FieldsFunc(l, util.IsNonAlphaNumeric)
 		for _, w := range words {
-			if bytes.HasPrefix(w, input) && utf8.RuneCount(w) > inputLen {
+			if bytes.HasPrefix(w, input) && util.CharacterCount(w) > inputLen {
 				strw := string(w)
 				if _, ok := suggestionsSet[strw]; !ok {
 					suggestionsSet[strw] = struct{}{}
--- a/internal/buffer/backup.go
+++ b/internal/buffer/backup.go
@@ -7,9 +7,9 @@ import (
 	"path/filepath"
 	"time"

-	"github.com/zyedidia/micro/internal/config"
-	"github.com/zyedidia/micro/internal/screen"
-	"github.com/zyedidia/micro/internal/util"
+	"github.com/zyedidia/micro/v2/internal/config"
+	"github.com/zyedidia/micro/v2/internal/screen"
+	"github.com/zyedidia/micro/v2/internal/util"
 	"golang.org/x/text/encoding"
 )

--- a/internal/buffer/buffer.go
+++ b/internal/buffer/buffer.go
@@ -15,16 +15,15 @@ import (
 	"strings"
 	"sync"
 	"time"
-	"unicode/utf8"

 	luar "layeh.com/gopher-luar"

 	dmp "github.com/sergi/go-diff/diffmatchpatch"
-	"github.com/zyedidia/micro/internal/config"
-	ulua "github.com/zyedidia/micro/internal/lua"
-	"github.com/zyedidia/micro/internal/screen"
-	"github.com/zyedidia/micro/internal/util"
-	"github.com/zyedidia/micro/pkg/highlight"
+	"github.com/zyedidia/micro/v2/internal/config"
+	ulua "github.com/zyedidia/micro/v2/internal/lua"
+	"github.com/zyedidia/micro/v2/internal/screen"
+	"github.com/zyedidia/micro/v2/internal/util"
+	"github.com/zyedidia/micro/v2/pkg/highlight"
 	"golang.org/x/text/encoding/htmlindex"
 	"golang.org/x/text/encoding/unicode"
 	"golang.org/x/text/transform"
@@ -152,14 +151,14 @@ func (b *SharedBuffer) MarkModified(start, end int) {
 		return
 	}

-	start = util.Clamp(start, 0, len(b.lines))
-	end = util.Clamp(end, 0, len(b.lines))
+	start = util.Clamp(start, 0, len(b.lines)-1)
+	end = util.Clamp(end, 0, len(b.lines)-1)

 	l := -1
 	for i := start; i <= end; i++ {
 		l = util.Max(b.Highlighter.ReHighlightStates(b, i), l)
 	}
-	b.Highlighter.HighlightMatches(b, start, l+1)
+	b.Highlighter.HighlightMatches(b, start, l)
 }

 // DisableReload disables future reloads of this sharedbuffer
@@ -474,7 +473,7 @@ func (b *Buffer) RuneAt(loc Loc) rune {
 	if len(line) > 0 {
 		i := 0
 		for len(line) > 0 {
-			r, size := utf8.DecodeRune(line)
+			r, _, size := util.DecodeCharacter(line)
 			line = line[size:]
 			i++

@@ -809,7 +808,7 @@ func (b *Buffer) MoveLinesUp(start int, end int) {
 	if end == len(b.lines) {
 		b.Insert(
 			Loc{
-				utf8.RuneCount(b.lines[end-1].data),
+				util.CharacterCount(b.lines[end-1].data),
 				end - 1,
 			},
 			"\n"+l,
--- a/internal/buffer/buffer_generated_test.go
+++ b/internal/buffer/buffer_generated_test.go
@@ -16,7 +16,7 @@ func TestAuto1(t *testing.T) {
 			"",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{1, 0},
 				end:   Loc{1, 0},
 				text: []string{
@@ -25,7 +25,7 @@ func TestAuto1(t *testing.T) {
 					"fq",
 				},
 			},
-			operation{
+			{
 				start: Loc{3, 0},
 				end:   Loc{0, 1},
 				text: []string{
@@ -58,7 +58,7 @@ func TestAuto2(t *testing.T) {
 			"gmm",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{1, 0},
 				end:   Loc{1, 0},
 				text: []string{
@@ -66,7 +66,7 @@ func TestAuto2(t *testing.T) {
 					"o",
 				},
 			},
-			operation{
+			{
 				start: Loc{3, 1},
 				end:   Loc{3, 1},
 				text: []string{
@@ -74,7 +74,7 @@ func TestAuto2(t *testing.T) {
 					"avb",
 				},
 			},
-			operation{
+			{
 				start: Loc{4, 1},
 				end:   Loc{1, 5},
 				text: []string{
@@ -111,7 +111,7 @@ func TestAuto3(t *testing.T) {
 			"xuccnb",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{2, 3},
 				end:   Loc{2, 3},
 				text: []string{
@@ -145,14 +145,14 @@ func TestAuto4(t *testing.T) {
 			"lnqdgorosf",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{2, 0},
 				end:   Loc{4, 0},
 				text: []string{
 					"hp",
 				},
 			},
-			operation{
+			{
 				start: Loc{6, 0},
 				end:   Loc{0, 1},
 				text: []string{
@@ -161,7 +161,7 @@ func TestAuto4(t *testing.T) {
 					"mpx",
 				},
 			},
-			operation{
+			{
 				start: Loc{1, 1},
 				end:   Loc{1, 1},
 				text: []string{
@@ -170,7 +170,7 @@ func TestAuto4(t *testing.T) {
 					"",
 				},
 			},
-			operation{
+			{
 				start: Loc{1, 1},
 				end:   Loc{1, 1},
 				text: []string{
@@ -178,7 +178,7 @@ func TestAuto4(t *testing.T) {
 					"mo",
 				},
 			},
-			operation{
+			{
 				start: Loc{1, 3},
 				end:   Loc{2, 4},
 				text: []string{
@@ -210,14 +210,14 @@ func TestBug19872UndoIsFunky(t *testing.T) {
 			"something else",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{0, 1},
 				end:   Loc{1, 1},
 				text: []string{
 					"",
 				},
 			},
-			operation{
+			{
 				start: Loc{0, 2},
 				end:   Loc{1, 3},
 				text: []string{
@@ -244,14 +244,14 @@ func TestBug19872UndoIsFunky_2(t *testing.T) {
 			"something else",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{0, 1},
 				end:   Loc{0, 1},
 				text: []string{
 					" ",
 				},
 			},
-			operation{
+			{
 				start: Loc{0, 2},
 				end:   Loc{0, 2},
 				text: []string{
@@ -281,7 +281,7 @@ func TestInsertEmptyText(t *testing.T) {
 			"1",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{0, 0},
 				end:   Loc{0, 0},
 				text: []string{
@@ -310,14 +310,14 @@ func TestLastOpIsNoOp(t *testing.T) {
 			"1",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{0, 0},
 				end:   Loc{1, 0},
 				text: []string{
 					"",
 				},
 			},
-			operation{
+			{
 				start: Loc{0, 3},
 				end:   Loc{0, 3},
 				text: []string{
@@ -346,7 +346,7 @@ func TestInsertTextWithoutNewline1(t *testing.T) {
 			"1",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{0, 0},
 				end:   Loc{0, 0},
 				text: []string{
@@ -375,7 +375,7 @@ func TestInsertTextWithoutNewline2(t *testing.T) {
 			"1",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{2, 0},
 				end:   Loc{2, 0},
 				text: []string{
@@ -404,7 +404,7 @@ func TestInsertOneNewline(t *testing.T) {
 			"1",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{3, 0},
 				end:   Loc{3, 0},
 				text: []string{
@@ -435,7 +435,7 @@ func TestInsertTextWithOneNewline(t *testing.T) {
 			"1",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{2, 0},
 				end:   Loc{2, 0},
 				text: []string{
@@ -466,7 +466,7 @@ func TestInsertTextWithTwoNewlines(t *testing.T) {
 			"1",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{2, 0},
 				end:   Loc{2, 0},
 				text: []string{
@@ -499,7 +499,7 @@ func TestInsertTextWithManyNewlines(t *testing.T) {
 			"1",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{2, 0},
 				end:   Loc{2, 0},
 				text: []string{
@@ -536,7 +536,7 @@ func TestInsertMultipleNewlines(t *testing.T) {
 			"1",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{2, 0},
 				end:   Loc{2, 0},
 				text: []string{
@@ -547,7 +547,7 @@ func TestInsertMultipleNewlines(t *testing.T) {
 					"",
 				},
 			},
-			operation{
+			{
 				start: Loc{14, 2},
 				end:   Loc{14, 2},
 				text: []string{
@@ -582,7 +582,7 @@ func TestDeleteEmptyText(t *testing.T) {
 			"1",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{0, 0},
 				end:   Loc{0, 0},
 				text: []string{
@@ -611,7 +611,7 @@ func TestDeleteTextFromOneLine(t *testing.T) {
 			"1",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{0, 0},
 				end:   Loc{1, 0},
 				text: []string{
@@ -640,7 +640,7 @@ func TestDeleteTextFromOneLine2(t *testing.T) {
 			"1",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{0, 0},
 				end:   Loc{2, 0},
 				text: []string{
@@ -669,7 +669,7 @@ func TestDeleteAllTextFromALine(t *testing.T) {
 			"1",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{0, 0},
 				end:   Loc{13, 0},
 				text: []string{
@@ -698,7 +698,7 @@ func TestDeleteTextFromTwoLines(t *testing.T) {
 			"1",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{3, 0},
 				end:   Loc{5, 1},
 				text: []string{
@@ -726,7 +726,7 @@ func TestDeleteTextFromManyLines(t *testing.T) {
 			"1",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{3, 0},
 				end:   Loc{4, 2},
 				text: []string{
@@ -753,7 +753,7 @@ func TestDeleteEverything(t *testing.T) {
 			"1",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{0, 0},
 				end:   Loc{1, 4},
 				text: []string{
@@ -778,14 +778,14 @@ func TestTwoUnrelatedEdits(t *testing.T) {
 			"123",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{0, 1},
 				end:   Loc{2, 1},
 				text: []string{
 					"\t",
 				},
 			},
-			operation{
+			{
 				start: Loc{0, 2},
 				end:   Loc{4, 2},
 				text: []string{
@@ -814,14 +814,14 @@ func TestTwoEditsOnOneLine(t *testing.T) {
 			"\t\t<!@#fifth#@!>\t\t",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{2, 4},
 				end:   Loc{6, 4},
 				text: []string{
 					"",
 				},
 			},
-			operation{
+			{
 				start: Loc{11, 4},
 				end:   Loc{15, 4},
 				text: []string{
@@ -846,21 +846,21 @@ func TestManyEdits(t *testing.T) {
 			"{\"x\" : 1}",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{1, 0},
 				end:   Loc{1, 0},
 				text: []string{
 					"\n  ",
 				},
 			},
-			operation{
+			{
 				start: Loc{4, 0},
 				end:   Loc{5, 0},
 				text: []string{
 					"",
 				},
 			},
-			operation{
+			{
 				start: Loc{8, 0},
 				end:   Loc{8, 0},
 				text: []string{
@@ -885,21 +885,21 @@ func TestManyEditsReversed(t *testing.T) {
 			"}",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{1, 0},
 				end:   Loc{2, 1},
 				text: []string{
 					"",
 				},
 			},
-			operation{
+			{
 				start: Loc{5, 1},
 				end:   Loc{5, 1},
 				text: []string{
 					" ",
 				},
 			},
-			operation{
+			{
 				start: Loc{8, 1},
 				end:   Loc{0, 2},
 				text: []string{
@@ -924,7 +924,7 @@ func TestReplacingNewlines1(t *testing.T) {
 			"}",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{1, 0},
 				end:   Loc{0, 1},
 				text: []string{
@@ -932,7 +932,7 @@ func TestReplacingNewlines1(t *testing.T) {
 					"\t",
 				},
 			},
-			operation{
+			{
 				start: Loc{10, 1},
 				end:   Loc{0, 3},
 				text: []string{
@@ -962,7 +962,7 @@ func TestReplacingNewlines2(t *testing.T) {
 			"and the last line",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{4, 0},
 				end:   Loc{0, 2},
 				text: []string{
@@ -971,7 +971,7 @@ func TestReplacingNewlines2(t *testing.T) {
 					"some more text",
 				},
 			},
-			operation{
+			{
 				start: Loc{1, 2},
 				end:   Loc{0, 3},
 				text: []string{
@@ -981,14 +981,14 @@ func TestReplacingNewlines2(t *testing.T) {
 					"asd",
 				},
 			},
-			operation{
+			{
 				start: Loc{0, 4},
 				end:   Loc{5, 4},
 				text: []string{
 					"zzzzzzzz",
 				},
 			},
-			operation{
+			{
 				start: Loc{10, 4},
 				end:   Loc{15, 5},
 				text: []string{
@@ -1024,14 +1024,14 @@ func TestAdvanced1(t *testing.T) {
 			"        ,\"e\": /*comment*/ [null] }",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{0, 0},
 				end:   Loc{1, 0},
 				text: []string{
 					"",
 				},
 			},
-			operation{
+			{
 				start: Loc{2, 0},
 				end:   Loc{9, 0},
 				text: []string{
@@ -1039,7 +1039,7 @@ func TestAdvanced1(t *testing.T) {
 					"  ",
 				},
 			},
-			operation{
+			{
 				start: Loc{15, 0},
 				end:   Loc{13, 1},
 				text: []string{
@@ -1047,7 +1047,7 @@ func TestAdvanced1(t *testing.T) {
 					"    ",
 				},
 			},
-			operation{
+			{
 				start: Loc{17, 1},
 				end:   Loc{8, 2},
 				text: []string{
@@ -1055,14 +1055,14 @@ func TestAdvanced1(t *testing.T) {
 					"  ",
 				},
 			},
-			operation{
+			{
 				start: Loc{21, 2},
 				end:   Loc{8, 3},
 				text: []string{
 					"",
 				},
 			},
-			operation{
+			{
 				start: Loc{9, 3},
 				end:   Loc{9, 3},
 				text: []string{
@@ -1070,7 +1070,7 @@ func TestAdvanced1(t *testing.T) {
 					"  ",
 				},
 			},
-			operation{
+			{
 				start: Loc{27, 3},
 				end:   Loc{27, 3},
 				text: []string{
@@ -1078,7 +1078,7 @@ func TestAdvanced1(t *testing.T) {
 					"    ",
 				},
 			},
-			operation{
+			{
 				start: Loc{31, 3},
 				end:   Loc{31, 3},
 				text: []string{
@@ -1086,7 +1086,7 @@ func TestAdvanced1(t *testing.T) {
 					"  ",
 				},
 			},
-			operation{
+			{
 				start: Loc{32, 3},
 				end:   Loc{33, 3},
 				text: []string{
@@ -1116,21 +1116,21 @@ func TestAdvancedSimplified(t *testing.T) {
 			" ,def",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{0, 0},
 				end:   Loc{3, 0},
 				text: []string{
 					"",
 				},
 			},
-			operation{
+			{
 				start: Loc{6, 0},
 				end:   Loc{1, 1},
 				text: []string{
 					"",
 				},
 			},
-			operation{
+			{
 				start: Loc{2, 1},
 				end:   Loc{2, 1},
 				text: []string{
@@ -1158,7 +1158,7 @@ func TestIssue144(t *testing.T) {
 			"",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{0, 0},
 				end:   Loc{0, 5},
 				text: []string{
@@ -1194,7 +1194,7 @@ func TestIssue2586ReplacingSelectedEndOfLineWithNewlineLocksUpTheDocument(t *tes
 			"interesting",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{9, 0},
 				end:   Loc{0, 1},
 				text: []string{
@@ -1222,7 +1222,7 @@ func TestIssue3980(t *testing.T) {
 			"}",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{7, 0},
 				end:   Loc{8, 0},
 				text: []string{
@@ -1230,7 +1230,7 @@ func TestIssue3980(t *testing.T) {
 					"",
 				},
 			},
-			operation{
+			{
 				start: Loc{16, 2},
 				end:   Loc{17, 2},
 				text: []string{
@@ -1238,14 +1238,14 @@ func TestIssue3980(t *testing.T) {
 					"",
 				},
 			},
-			operation{
+			{
 				start: Loc{17, 2},
 				end:   Loc{17, 2},
 				text: []string{
 					"    ",
 				},
 			},
-			operation{
+			{
 				start: Loc{4, 3},
 				end:   Loc{4, 3},
 				text: []string{
@@ -1273,14 +1273,14 @@ func TestTouchingEditsTwoInsertsAtTheSamePosition(t *testing.T) {
 			"hello world",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{0, 0},
 				end:   Loc{0, 0},
 				text: []string{
 					"a",
 				},
 			},
-			operation{
+			{
 				start: Loc{0, 0},
 				end:   Loc{0, 0},
 				text: []string{
@@ -1301,14 +1301,14 @@ func TestTouchingEditsInsertAndReplaceTouching(t *testing.T) {
 			"hello world",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{0, 0},
 				end:   Loc{0, 0},
 				text: []string{
 					"b",
 				},
 			},
-			operation{
+			{
 				start: Loc{0, 0},
 				end:   Loc{2, 0},
 				text: []string{
@@ -1329,14 +1329,14 @@ func TestTouchingEditsTwoTouchingReplaces(t *testing.T) {
 			"hello world",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{0, 0},
 				end:   Loc{1, 0},
 				text: []string{
 					"H",
 				},
 			},
-			operation{
+			{
 				start: Loc{1, 0},
 				end:   Loc{2, 0},
 				text: []string{
@@ -1357,14 +1357,14 @@ func TestTouchingEditsTwoTouchingDeletes(t *testing.T) {
 			"hello world",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{0, 0},
 				end:   Loc{1, 0},
 				text: []string{
 					"",
 				},
 			},
-			operation{
+			{
 				start: Loc{1, 0},
 				end:   Loc{2, 0},
 				text: []string{
@@ -1385,14 +1385,14 @@ func TestTouchingEditsInsertAndReplace(t *testing.T) {
 			"hello world",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{0, 0},
 				end:   Loc{0, 0},
 				text: []string{
 					"H",
 				},
 			},
-			operation{
+			{
 				start: Loc{0, 0},
 				end:   Loc{2, 0},
 				text: []string{
@@ -1413,14 +1413,14 @@ func TestTouchingEditsReplaceAndInsert(t *testing.T) {
 			"hello world",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{0, 0},
 				end:   Loc{2, 0},
 				text: []string{
 					"H",
 				},
 			},
-			operation{
+			{
 				start: Loc{2, 0},
 				end:   Loc{2, 0},
 				text: []string{
@@ -1441,7 +1441,7 @@ func TestSingleDelete1(t *testing.T) {
 			"hello world",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{0, 0},
 				end:   Loc{1, 0},
 				text: []string{
@@ -1462,7 +1462,7 @@ func TestSingleDelete2(t *testing.T) {
 			"helloworld",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{2, 0},
 				end:   Loc{7, 0},
 				text: []string{
@@ -1483,7 +1483,7 @@ func TestSingleDelete3(t *testing.T) {
 			"hello world",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{0, 0},
 				end:   Loc{5, 0},
 				text: []string{
@@ -1504,7 +1504,7 @@ func TestSingleDelete4(t *testing.T) {
 			"hello world",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{1, 0},
 				end:   Loc{6, 0},
 				text: []string{
@@ -1525,7 +1525,7 @@ func TestSingleDelete5(t *testing.T) {
 			"hello world",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{0, 0},
 				end:   Loc{11, 0},
 				text: []string{
@@ -1548,7 +1548,7 @@ func TestMultiDelete6(t *testing.T) {
 			"hello world",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{5, 0},
 				end:   Loc{5, 2},
 				text: []string{
@@ -1571,7 +1571,7 @@ func TestMultiDelete7(t *testing.T) {
 			"hello world",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{11, 0},
 				end:   Loc{11, 2},
 				text: []string{
@@ -1594,7 +1594,7 @@ func TestMultiDelete8(t *testing.T) {
 			"hello world",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{0, 0},
 				end:   Loc{0, 2},
 				text: []string{
@@ -1617,7 +1617,7 @@ func TestMultiDelete9(t *testing.T) {
 			"hello world",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{11, 0},
 				end:   Loc{0, 2},
 				text: []string{
@@ -1638,7 +1638,7 @@ func TestSingleInsert1(t *testing.T) {
 			"hello world",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{0, 0},
 				end:   Loc{0, 0},
 				text: []string{
@@ -1659,7 +1659,7 @@ func TestSingleInsert2(t *testing.T) {
 			"hello world",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{1, 0},
 				end:   Loc{1, 0},
 				text: []string{
@@ -1680,7 +1680,7 @@ func TestSingleInsert3(t *testing.T) {
 			"hello world",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{5, 0},
 				end:   Loc{5, 0},
 				text: []string{
@@ -1701,7 +1701,7 @@ func TestSingleInsert4(t *testing.T) {
 			"hello world",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{6, 0},
 				end:   Loc{6, 0},
 				text: []string{
@@ -1722,7 +1722,7 @@ func TestSingleInsert5(t *testing.T) {
 			"hello world",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{11, 0},
 				end:   Loc{11, 0},
 				text: []string{
@@ -1743,7 +1743,7 @@ func TestMultiInsert6(t *testing.T) {
 			"hello world",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{0, 0},
 				end:   Loc{0, 0},
 				text: []string{
@@ -1765,7 +1765,7 @@ func TestMultiInsert7(t *testing.T) {
 			"hello world",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{11, 0},
 				end:   Loc{11, 0},
 				text: []string{
@@ -1787,7 +1787,7 @@ func TestMultiInsert8(t *testing.T) {
 			"hello world",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{6, 0},
 				end:   Loc{6, 0},
 				text: []string{
@@ -1810,7 +1810,7 @@ func TestMultiInsert9(t *testing.T) {
 			"hello world",
 		},
 		[]operation{
-			operation{
+			{
 				start: Loc{6, 0},
 				end:   Loc{6, 0},
 				text: []string{
@@ -1825,65 +1825,3 @@ func TestMultiInsert9(t *testing.T) {
 		},
 	)
 }
-
-func BenchmarkBuffer(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		TestAuto1(nil)
-		TestAuto2(nil)
-		TestAuto3(nil)
-		TestAuto4(nil)
-		TestBug19872UndoIsFunky(nil)
-		TestBug19872UndoIsFunky_2(nil)
-		TestInsertEmptyText(nil)
-		TestLastOpIsNoOp(nil)
-		TestInsertTextWithoutNewline1(nil)
-		TestInsertTextWithoutNewline2(nil)
-		TestInsertOneNewline(nil)
-		TestInsertTextWithOneNewline(nil)
-		TestInsertTextWithTwoNewlines(nil)
-		TestInsertTextWithManyNewlines(nil)
-		TestInsertMultipleNewlines(nil)
-		TestDeleteEmptyText(nil)
-		TestDeleteTextFromOneLine(nil)
-		TestDeleteTextFromOneLine2(nil)
-		TestDeleteAllTextFromALine(nil)
-		TestDeleteTextFromTwoLines(nil)
-		TestDeleteTextFromManyLines(nil)
-		TestDeleteEverything(nil)
-		TestTwoUnrelatedEdits(nil)
-		TestTwoEditsOnOneLine(nil)
-		TestManyEdits(nil)
-		TestManyEditsReversed(nil)
-		TestReplacingNewlines1(nil)
-		TestReplacingNewlines2(nil)
-		TestAdvanced1(nil)
-		TestAdvancedSimplified(nil)
-		TestIssue144(nil)
-		TestIssue2586ReplacingSelectedEndOfLineWithNewlineLocksUpTheDocument(nil)
-		TestIssue3980(nil)
-		TestTouchingEditsTwoInsertsAtTheSamePosition(nil)
-		TestTouchingEditsInsertAndReplaceTouching(nil)
-		TestTouchingEditsTwoTouchingReplaces(nil)
-		TestTouchingEditsTwoTouchingDeletes(nil)
-		TestTouchingEditsInsertAndReplace(nil)
-		TestTouchingEditsReplaceAndInsert(nil)
-		TestSingleDelete1(nil)
-		TestSingleDelete2(nil)
-		TestSingleDelete3(nil)
-		TestSingleDelete4(nil)
-		TestSingleDelete5(nil)
-		TestMultiDelete6(nil)
-		TestMultiDelete7(nil)
-		TestMultiDelete8(nil)
-		TestMultiDelete9(nil)
-		TestSingleInsert1(nil)
-		TestSingleInsert2(nil)
-		TestSingleInsert3(nil)
-		TestSingleInsert4(nil)
-		TestSingleInsert5(nil)
-		TestMultiInsert6(nil)
-		TestMultiInsert7(nil)
-		TestMultiInsert8(nil)
-		TestMultiInsert9(nil)
-	}
-}
--- a/internal/buffer/buffer_test.go
+++ b/internal/buffer/buffer_test.go
@@ -1,13 +1,15 @@
 package buffer

 import (
+	"math/rand"
 	"strings"
 	"testing"

-	testifyAssert "github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/assert"
 	lua "github.com/yuin/gopher-lua"
-
-	ulua "github.com/zyedidia/micro/internal/lua"
+	"github.com/zyedidia/micro/v2/internal/config"
+	ulua "github.com/zyedidia/micro/v2/internal/lua"
+	"github.com/zyedidia/micro/v2/internal/util"
 )

 type operation struct {
@@ -16,34 +18,15 @@ type operation struct {
 	text  []string
 }

-type asserter interface {
-	Equal(interface{}, interface{}, ...interface{}) bool
-	NotEqual(interface{}, interface{}, ...interface{}) bool
-}
-
-type noOpAsserter struct {
-}
-
-func (a *noOpAsserter) Equal(interface{}, interface{}, ...interface{}) bool {
-	return true
-}
-
-func (a *noOpAsserter) NotEqual(interface{}, interface{}, ...interface{}) bool {
-	return true
-}
-
 func init() {
 	ulua.L = lua.NewState()
+	config.InitGlobalSettings()
+	config.GlobalSettings["backup"] = false
+	config.GlobalSettings["fastdirty"] = true
 }

 func check(t *testing.T, before []string, operations []operation, after []string) {
-	var assert asserter
-	if t == nil {
-		// Benchmark mode; don't perform assertions
-		assert = &noOpAsserter{}
-	} else {
-		assert = testifyAssert.New(t)
-	}
+	assert := assert.New(t)

 	b := NewBufferFromString(strings.Join(before, "\n"), "", BTDefault)

@@ -111,3 +94,229 @@ func check(t *testing.T, before []string, operations []operation, after []string

 	b.Close()
 }
+
+const maxLineLength = 200
+
+var alphabet = []rune(" abcdeäم📚")
+
+func randomString(length int) string {
+	runes := make([]rune, length)
+	for i := range runes {
+		runes[i] = alphabet[rand.Intn(len(alphabet))]
+	}
+	return string(runes)
+}
+
+func randomText(nLines int) string {
+	lines := make([]string, nLines)
+	for i := range lines {
+		lines[i] = randomString(rand.Intn(maxLineLength + 1))
+	}
+	return strings.Join(lines, "\n")
+}
+
+func benchCreateAndClose(testingB *testing.B, nLines int) {
+	rand.Seed(int64(nLines))
+
+	text := randomText(nLines)
+
+	testingB.ResetTimer()
+
+	for i := 0; i < testingB.N; i++ {
+		b := NewBufferFromString(text, "", BTDefault)
+		b.Close()
+	}
+}
+
+func benchRead(testingB *testing.B, nLines int) {
+	rand.Seed(int64(nLines))
+
+	b := NewBufferFromString(randomText(nLines), "", BTDefault)
+
+	testingB.ResetTimer()
+
+	for i := 0; i < testingB.N; i++ {
+		b.Bytes()
+		for j := 0; j < b.LinesNum(); j++ {
+			b.Line(j)
+			b.LineBytes(j)
+		}
+	}
+
+	testingB.StopTimer()
+
+	b.Close()
+}
+
+func benchEdit(testingB *testing.B, nLines, nCursors int) {
+	rand.Seed(int64(nLines + nCursors))
+
+	b := NewBufferFromString(randomText(nLines), "", BTDefault)
+
+	regionSize := nLines / nCursors
+
+	operations := make([]operation, nCursors)
+	for i := range operations {
+		startLine := (i * regionSize) + rand.Intn(regionSize-5)
+		startColumn := rand.Intn(util.CharacterCountInString(b.Line(startLine)) + 1)
+		endLine := startLine + 1 + rand.Intn(5)
+		endColumn := rand.Intn(util.CharacterCountInString(b.Line(endLine)) + 1)
+
+		operations[i] = operation{
+			start: Loc{startColumn, startLine},
+			end:   Loc{endColumn, endLine},
+			text:  []string{randomText(2 + rand.Intn(4))},
+		}
+	}
+
+	testingB.ResetTimer()
+
+	for i := 0; i < testingB.N; i++ {
+		b.SetCursors([]*Cursor{})
+
+		var cursors []*Cursor
+
+		for _, op := range operations {
+			cursor := NewCursor(b, op.start)
+			cursor.SetSelectionStart(op.start)
+			cursor.SetSelectionEnd(op.end)
+			b.AddCursor(cursor)
+			cursors = append(cursors, cursor)
+		}
+
+		for j, op := range operations {
+			cursor := cursors[j]
+			b.SetCurCursor(cursor.Num)
+			cursor.DeleteSelection()
+			b.Insert(cursor.Loc, op.text[0])
+		}
+
+		for b.UndoStack.Peek() != nil {
+			b.UndoOneEvent()
+		}
+	}
+
+	testingB.StopTimer()
+
+	b.Close()
+}
+
+func BenchmarkCreateAndClose10Lines(b *testing.B) {
+	benchCreateAndClose(b, 10)
+}
+
+func BenchmarkCreateAndClose100Lines(b *testing.B) {
+	benchCreateAndClose(b, 100)
+}
+
+func BenchmarkCreateAndClose1000Lines(b *testing.B) {
+	benchCreateAndClose(b, 1000)
+}
+
+func BenchmarkCreateAndClose10000Lines(b *testing.B) {
+	benchCreateAndClose(b, 10000)
+}
+
+func BenchmarkCreateAndClose100000Lines(b *testing.B) {
+	benchCreateAndClose(b, 100000)
+}
+
+func BenchmarkCreateAndClose1000000Lines(b *testing.B) {
+	benchCreateAndClose(b, 1000000)
+}
+
+func BenchmarkRead10Lines(b *testing.B) {
+	benchRead(b, 10)
+}
+
+func BenchmarkRead100Lines(b *testing.B) {
+	benchRead(b, 100)
+}
+
+func BenchmarkRead1000Lines(b *testing.B) {
+	benchRead(b, 1000)
+}
+
+func BenchmarkRead10000Lines(b *testing.B) {
+	benchRead(b, 10000)
+}
+
+func BenchmarkRead100000Lines(b *testing.B) {
+	benchRead(b, 100000)
+}
+
+func BenchmarkRead1000000Lines(b *testing.B) {
+	benchRead(b, 1000000)
+}
+
+func BenchmarkEdit10Lines1Cursor(b *testing.B) {
+	benchEdit(b, 10, 1)
+}
+
+func BenchmarkEdit100Lines1Cursor(b *testing.B) {
+	benchEdit(b, 100, 1)
+}
+
+func BenchmarkEdit100Lines10Cursors(b *testing.B) {
+	benchEdit(b, 100, 10)
+}
+
+func BenchmarkEdit1000Lines1Cursor(b *testing.B) {
+	benchEdit(b, 1000, 1)
+}
+
+func BenchmarkEdit1000Lines10Cursors(b *testing.B) {
+	benchEdit(b, 1000, 10)
+}
+
+func BenchmarkEdit1000Lines100Cursors(b *testing.B) {
+	benchEdit(b, 1000, 100)
+}
+
+func BenchmarkEdit10000Lines1Cursor(b *testing.B) {
+	benchEdit(b, 10000, 1)
+}
+
+func BenchmarkEdit10000Lines10Cursors(b *testing.B) {
+	benchEdit(b, 10000, 10)
+}
+
+func BenchmarkEdit10000Lines100Cursors(b *testing.B) {
+	benchEdit(b, 10000, 100)
+}
+
+func BenchmarkEdit10000Lines1000Cursors(b *testing.B) {
+	benchEdit(b, 10000, 1000)
+}
+
+func BenchmarkEdit100000Lines1Cursor(b *testing.B) {
+	benchEdit(b, 100000, 1)
+}
+
+func BenchmarkEdit100000Lines10Cursors(b *testing.B) {
+	benchEdit(b, 100000, 10)
+}
+
+func BenchmarkEdit100000Lines100Cursors(b *testing.B) {
+	benchEdit(b, 100000, 100)
+}
+
+func BenchmarkEdit100000Lines1000Cursors(b *testing.B) {
+	benchEdit(b, 100000, 1000)
+}
+
+func BenchmarkEdit1000000Lines1Cursor(b *testing.B) {
+	benchEdit(b, 1000000, 1)
+}
+
+func BenchmarkEdit1000000Lines10Cursors(b *testing.B) {
+	benchEdit(b, 1000000, 10)
+}
+
+func BenchmarkEdit1000000Lines100Cursors(b *testing.B) {
+	benchEdit(b, 1000000, 100)
+}
+
+func BenchmarkEdit1000000Lines1000Cursors(b *testing.B) {
+	benchEdit(b, 1000000, 1000)
+}
--- a/internal/buffer/cursor.go
+++ b/internal/buffer/cursor.go
@@ -1,15 +1,13 @@
 package buffer

 import (
-	"unicode/utf8"
-
 	"github.com/zyedidia/clipboard"
-	"github.com/zyedidia/micro/internal/util"
+	"github.com/zyedidia/micro/v2/internal/util"
 )

 // InBounds returns whether the given location is a valid character position in the given buffer
 func InBounds(pos Loc, buf *Buffer) bool {
-	if pos.Y < 0 || pos.Y >= len(buf.lines) || pos.X < 0 || pos.X > utf8.RuneCount(buf.LineBytes(pos.Y)) {
+	if pos.Y < 0 || pos.Y >= len(buf.lines) || pos.X < 0 || pos.X > util.CharacterCount(buf.LineBytes(pos.Y)) {
 		return false
 	}

@@ -76,8 +74,8 @@ func (c *Cursor) GetVisualX() int {

 	bytes := c.buf.LineBytes(c.Y)
 	tabsize := int(c.buf.Settings["tabsize"].(float64))
-	if c.X > utf8.RuneCount(bytes) {
-		c.X = utf8.RuneCount(bytes) - 1
+	if c.X > util.CharacterCount(bytes) {
+		c.X = util.CharacterCount(bytes) - 1
 	}

 	return util.StringWidth(bytes, c.X, tabsize)
@@ -102,7 +100,7 @@ func (c *Cursor) Start() {
 func (c *Cursor) StartOfText() {
 	c.Start()
 	for util.IsWhitespace(c.RuneUnder(c.X)) {
-		if c.X == utf8.RuneCount(c.buf.LineBytes(c.Y)) {
+		if c.X == util.CharacterCount(c.buf.LineBytes(c.Y)) {
 			break
 		}
 		c.Right()
@@ -114,7 +112,7 @@ func (c *Cursor) StartOfText() {
 func (c *Cursor) IsStartOfText() bool {
 	x := 0
 	for util.IsWhitespace(c.RuneUnder(x)) {
-		if x == utf8.RuneCount(c.buf.LineBytes(c.Y)) {
+		if x == util.CharacterCount(c.buf.LineBytes(c.Y)) {
 			break
 		}
 		x++
@@ -124,7 +122,7 @@ func (c *Cursor) IsStartOfText() bool {

 // End moves the cursor to the end of the line it is on
 func (c *Cursor) End() {
-	c.X = utf8.RuneCount(c.buf.LineBytes(c.Y))
+	c.X = util.CharacterCount(c.buf.LineBytes(c.Y))
 	c.LastVisualX = c.GetVisualX()
 }

@@ -242,8 +240,8 @@ func (c *Cursor) UpN(amount int) {
 	bytes := c.buf.LineBytes(proposedY)
 	c.X = c.GetCharPosInLine(bytes, c.LastVisualX)

-	if c.X > utf8.RuneCount(bytes) || (amount < 0 && proposedY == c.Y) {
-		c.X = utf8.RuneCount(bytes)
+	if c.X > util.CharacterCount(bytes) || (amount < 0 && proposedY == c.Y) {
+		c.X = util.CharacterCount(bytes)
 	}

 	c.Y = proposedY
@@ -285,7 +283,7 @@ func (c *Cursor) Right() {
 	if c.Loc == c.buf.End() {
 		return
 	}
-	if c.X < utf8.RuneCount(c.buf.LineBytes(c.Y)) {
+	if c.X < util.CharacterCount(c.buf.LineBytes(c.Y)) {
 		c.X++
 	} else {
 		c.Down()
@@ -306,8 +304,8 @@ func (c *Cursor) Relocate() {

 	if c.X < 0 {
 		c.X = 0
-	} else if c.X > utf8.RuneCount(c.buf.LineBytes(c.Y)) {
-		c.X = utf8.RuneCount(c.buf.LineBytes(c.Y))
+	} else if c.X > util.CharacterCount(c.buf.LineBytes(c.Y)) {
+		c.X = util.CharacterCount(c.buf.LineBytes(c.Y))
 	}
 }

@@ -333,7 +331,7 @@ func (c *Cursor) SelectWord() {
 	c.SetSelectionStart(Loc{backward, c.Y})
 	c.OrigSelection[0] = c.CurSelection[0]

-	lineLen := utf8.RuneCount(c.buf.LineBytes(c.Y)) - 1
+	lineLen := util.CharacterCount(c.buf.LineBytes(c.Y)) - 1
 	for forward < lineLen && util.IsWordChar(c.RuneUnder(forward+1)) {
 		forward++
 	}
@@ -365,7 +363,7 @@ func (c *Cursor) AddWordToSelection() {
 	if c.Loc.GreaterThan(c.OrigSelection[1]) {
 		forward := c.X

-		lineLen := utf8.RuneCount(c.buf.LineBytes(c.Y)) - 1
+		lineLen := util.CharacterCount(c.buf.LineBytes(c.Y)) - 1
 		for forward < lineLen && util.IsWordChar(c.RuneUnder(forward+1)) {
 			forward++
 		}
@@ -392,7 +390,7 @@ func (c *Cursor) SelectTo(loc Loc) {
 // WordRight moves the cursor one word to the right
 func (c *Cursor) WordRight() {
 	for util.IsWhitespace(c.RuneUnder(c.X)) {
-		if c.X == utf8.RuneCount(c.buf.LineBytes(c.Y)) {
+		if c.X == util.CharacterCount(c.buf.LineBytes(c.Y)) {
 			c.Right()
 			return
 		}
@@ -400,7 +398,7 @@ func (c *Cursor) WordRight() {
 	}
 	c.Right()
 	for util.IsWordChar(c.RuneUnder(c.X)) {
-		if c.X == utf8.RuneCount(c.buf.LineBytes(c.Y)) {
+		if c.X == util.CharacterCount(c.buf.LineBytes(c.Y)) {
 			return
 		}
 		c.Right()
@@ -429,14 +427,14 @@ func (c *Cursor) WordLeft() {
 // RuneUnder returns the rune under the given x position
 func (c *Cursor) RuneUnder(x int) rune {
 	line := c.buf.LineBytes(c.Y)
-	if len(line) == 0 || x >= utf8.RuneCount(line) {
+	if len(line) == 0 || x >= util.CharacterCount(line) {
 		return '\n'
 	} else if x < 0 {
 		x = 0
 	}
 	i := 0
 	for len(line) > 0 {
-		r, size := utf8.DecodeRune(line)
+		r, _, size := util.DecodeCharacter(line)
 		line = line[size:]

 		if i == x {
--- a/internal/buffer/eventhandler.go
+++ b/internal/buffer/eventhandler.go
@@ -3,12 +3,12 @@ package buffer
 import (
 	"bytes"
 	"time"
-	"unicode/utf8"

 	dmp "github.com/sergi/go-diff/diffmatchpatch"
-	"github.com/zyedidia/micro/internal/config"
-	ulua "github.com/zyedidia/micro/internal/lua"
-	"github.com/zyedidia/micro/internal/screen"
+	"github.com/zyedidia/micro/v2/internal/config"
+	ulua "github.com/zyedidia/micro/v2/internal/lua"
+	"github.com/zyedidia/micro/v2/internal/screen"
+	"github.com/zyedidia/micro/v2/internal/util"
 	luar "layeh.com/gopher-luar"
 )

@@ -62,10 +62,10 @@ func (eh *EventHandler) DoTextEvent(t *TextEvent, useUndo bool) {
 	var textX int
 	if t.EventType == TextEventInsert {
 		linecount := eh.buf.LinesNum() - oldl
-		textcount := utf8.RuneCount(text)
+		textcount := util.CharacterCount(text)
 		lastnl = bytes.LastIndex(text, []byte{'\n'})
 		if lastnl >= 0 {
-			endX = utf8.RuneCount(text[lastnl+1:])
+			endX = util.CharacterCount(text[lastnl+1:])
 			textX = endX
 		} else {
 			endX = start.X + textcount
@@ -123,7 +123,7 @@ func ExecuteTextEvent(t *TextEvent, buf *SharedBuffer) {
 			t.Deltas[i].Text = buf.remove(d.Start, d.End)
 			buf.insert(d.Start, d.Text)
 			t.Deltas[i].Start = d.Start
-			t.Deltas[i].End = Loc{d.Start.X + utf8.RuneCount(d.Text), d.Start.Y}
+			t.Deltas[i].End = Loc{d.Start.X + util.CharacterCount(d.Text), d.Start.Y}
 		}
 		for i, j := 0, len(t.Deltas)-1; i < j; i, j = i+1, j-1 {
 			t.Deltas[i], t.Deltas[j] = t.Deltas[j], t.Deltas[i]
@@ -166,12 +166,12 @@ func (eh *EventHandler) ApplyDiff(new string) {
 	loc := eh.buf.Start()
 	for _, d := range diff {
 		if d.Type == dmp.DiffDelete {
-			eh.Remove(loc, loc.MoveLA(utf8.RuneCountInString(d.Text), eh.buf.LineArray))
+			eh.Remove(loc, loc.MoveLA(util.CharacterCountInString(d.Text), eh.buf.LineArray))
 		} else {
 			if d.Type == dmp.DiffInsert {
 				eh.Insert(loc, d.Text)
 			}
-			loc = loc.MoveLA(utf8.RuneCountInString(d.Text), eh.buf.LineArray)
+			loc = loc.MoveLA(util.CharacterCountInString(d.Text), eh.buf.LineArray)
 		}
 	}
 }
--- a/internal/buffer/line_array.go
+++ b/internal/buffer/line_array.go
@@ -5,9 +5,9 @@ import (
 	"bytes"
 	"io"
 	"sync"
-	"unicode/utf8"

-	"github.com/zyedidia/micro/pkg/highlight"
+	"github.com/zyedidia/micro/v2/internal/util"
+	"github.com/zyedidia/micro/v2/pkg/highlight"
 )

 // Finds the byte index of the nth rune in a byte slice
@@ -19,7 +19,7 @@ func runeToByteIndex(n int, txt []byte) int {
 	count := 0
 	i := 0
 	for len(txt) > 0 {
-		_, size := utf8.DecodeRune(txt)
+		_, _, size := util.DecodeCharacter(txt)

 		txt = txt[size:]
 		count += size
@@ -299,7 +299,7 @@ func (la *LineArray) Start() Loc {
 // End returns the location of the last character in the buffer
 func (la *LineArray) End() Loc {
 	numlines := len(la.lines)
-	return Loc{utf8.RuneCount(la.lines[numlines-1].data), numlines - 1}
+	return Loc{util.CharacterCount(la.lines[numlines-1].data), numlines - 1}
 }

 // LineBytes returns line n as an array of bytes
--- a/internal/buffer/line_array_test.go
+++ b/internal/buffer/line_array_test.go
@@ -46,14 +46,15 @@ func TestInsert(t *testing.T) {

 	assert.Equal(t, []byte("Uppen Sevarne staþe, foobar sel þar him þuhte,"), sub1)

-	la.insert(Loc{25, 2}, []byte("ಮಣ್ಣಾಗಿ"))
+	la.insert(Loc{25, 2}, []byte("H̼̥̯͇͙̕͘͞e̸̦̞̠̣̰͙̼̥̦̼̖̬͕͕̰̯̫͇̕ĺ̜̠̩̯̯͙̼̭̠͕̮̞͜l̶͓̫̞̮͈͞ͅo̸͔͙̳̠͈̮̼̳͙̥̲͜͠"))
+
 	sub2 := la.Substr(Loc{0, 2}, Loc{60, 2})
-	assert.Equal(t, []byte("He wonede at Ernleȝe at æಮಣ್ಣಾಗಿðelen are chirechen,"), sub2)
+	assert.Equal(t, []byte("He wonede at Ernleȝe at æH̼̥̯͇͙̕͘͞e̸̦̞̠̣̰͙̼̥̦̼̖̬͕͕̰̯̫͇̕ĺ̜̠̩̯̯͙̼̭̠͕̮̞͜l̶͓̫̞̮͈͞ͅo̸͔͙̳̠͈̮̼̳͙̥̲͜͠ðelen are chirechen,"), sub2)
 }

 func TestRemove(t *testing.T) {
 	la.remove(Loc{20, 3}, Loc{27, 3})
-	la.remove(Loc{25, 2}, Loc{32, 2})
+	la.remove(Loc{25, 2}, Loc{30, 2})

 	bytes := la.Bytes()
 	assert.Equal(t, unicode_txt, string(bytes))
--- a/internal/buffer/loc.go
+++ b/internal/buffer/loc.go
@@ -1,9 +1,7 @@
 package buffer

 import (
-	"unicode/utf8"
-
-	"github.com/zyedidia/micro/internal/util"
+	"github.com/zyedidia/micro/v2/internal/util"
 )

 // Loc stores a location
@@ -68,9 +66,9 @@ func DiffLA(a, b Loc, buf *LineArray) int {
 	loc := 0
 	for i := a.Y + 1; i < b.Y; i++ {
 		// + 1 for the newline
-		loc += utf8.RuneCount(buf.LineBytes(i)) + 1
+		loc += util.CharacterCount(buf.LineBytes(i)) + 1
 	}
-	loc += utf8.RuneCount(buf.LineBytes(a.Y)) - a.X + b.X + 1
+	loc += util.CharacterCount(buf.LineBytes(a.Y)) - a.X + b.X + 1
 	return loc
 }

@@ -80,7 +78,7 @@ func (l Loc) right(buf *LineArray) Loc {
 		return Loc{l.X + 1, l.Y}
 	}
 	var res Loc
-	if l.X < utf8.RuneCount(buf.LineBytes(l.Y)) {
+	if l.X < util.CharacterCount(buf.LineBytes(l.Y)) {
 		res = Loc{l.X + 1, l.Y}
 	} else {
 		res = Loc{0, l.Y + 1}
@@ -97,7 +95,7 @@ func (l Loc) left(buf *LineArray) Loc {
 	if l.X > 0 {
 		res = Loc{l.X - 1, l.Y}
 	} else {
-		res = Loc{utf8.RuneCount(buf.LineBytes(l.Y - 1)), l.Y - 1}
+		res = Loc{util.CharacterCount(buf.LineBytes(l.Y - 1)), l.Y - 1}
 	}
 	return res
 }
--- a/internal/buffer/message.go
+++ b/internal/buffer/message.go
@@ -1,7 +1,7 @@
 package buffer

 import (
-	"github.com/zyedidia/micro/internal/config"
+	"github.com/zyedidia/micro/v2/internal/config"
 	"github.com/zyedidia/tcell"
 )

--- a/internal/buffer/save.go
+++ b/internal/buffer/save.go
@@ -11,11 +11,10 @@ import (
 	"path/filepath"
 	"runtime"
 	"unicode"
-	"unicode/utf8"

-	"github.com/zyedidia/micro/internal/config"
-	"github.com/zyedidia/micro/internal/screen"
-	"github.com/zyedidia/micro/internal/util"
+	"github.com/zyedidia/micro/v2/internal/config"
+	"github.com/zyedidia/micro/v2/internal/screen"
+	"github.com/zyedidia/micro/v2/internal/util"
 	"golang.org/x/text/encoding"
 	"golang.org/x/text/encoding/htmlindex"
 	"golang.org/x/text/transform"
@@ -100,9 +99,9 @@ func (b *Buffer) saveToFile(filename string, withSudo bool) error {
 	b.UpdateRules()
 	if b.Settings["rmtrailingws"].(bool) {
 		for i, l := range b.lines {
-			leftover := utf8.RuneCount(bytes.TrimRightFunc(l.data, unicode.IsSpace))
+			leftover := util.CharacterCount(bytes.TrimRightFunc(l.data, unicode.IsSpace))

-			linelen := utf8.RuneCount(l.data)
+			linelen := util.CharacterCount(l.data)
 			b.Remove(Loc{leftover, i}, Loc{linelen, i})
 		}

--- a/internal/buffer/search.go
+++ b/internal/buffer/search.go
@@ -2,9 +2,8 @@ package buffer

 import (
 	"regexp"
-	"unicode/utf8"

-	"github.com/zyedidia/micro/internal/util"
+	"github.com/zyedidia/micro/v2/internal/util"
 )

 func (b *Buffer) findDown(r *regexp.Regexp, start, end Loc) ([2]Loc, bool) {
@@ -20,19 +19,19 @@ func (b *Buffer) findDown(r *regexp.Regexp, start, end Loc) ([2]Loc, bool) {
 		charpos := 0

 		if i == start.Y && start.Y == end.Y {
-			nchars := utf8.RuneCount(l)
+			nchars := util.CharacterCount(l)
 			start.X = util.Clamp(start.X, 0, nchars)
 			end.X = util.Clamp(end.X, 0, nchars)
 			l = util.SliceStart(l, end.X)
 			l = util.SliceEnd(l, start.X)
 			charpos = start.X
 		} else if i == start.Y {
-			nchars := utf8.RuneCount(l)
+			nchars := util.CharacterCount(l)
 			start.X = util.Clamp(start.X, 0, nchars)
 			l = util.SliceEnd(l, start.X)
 			charpos = start.X
 		} else if i == end.Y {
-			nchars := utf8.RuneCount(l)
+			nchars := util.CharacterCount(l)
 			end.X = util.Clamp(end.X, 0, nchars)
 			l = util.SliceStart(l, end.X)
 		}
@@ -61,19 +60,19 @@ func (b *Buffer) findUp(r *regexp.Regexp, start, end Loc) ([2]Loc, bool) {
 		charpos := 0

 		if i == start.Y && start.Y == end.Y {
-			nchars := utf8.RuneCount(l)
+			nchars := util.CharacterCount(l)
 			start.X = util.Clamp(start.X, 0, nchars)
 			end.X = util.Clamp(end.X, 0, nchars)
 			l = util.SliceStart(l, end.X)
 			l = util.SliceEnd(l, start.X)
 			charpos = start.X
 		} else if i == start.Y {
-			nchars := utf8.RuneCount(l)
+			nchars := util.CharacterCount(l)
 			start.X = util.Clamp(start.X, 0, nchars)
 			l = util.SliceEnd(l, start.X)
 			charpos = start.X
 		} else if i == end.Y {
-			nchars := utf8.RuneCount(l)
+			nchars := util.CharacterCount(l)
 			end.X = util.Clamp(end.X, 0, nchars)
 			l = util.SliceStart(l, end.X)
 		}
@@ -163,12 +162,12 @@ func (b *Buffer) ReplaceRegex(start, end Loc, search *regexp.Regexp, replace []b
 				result = search.Expand(result, replace, in, submatches)
 			}
 			found++
-			netrunes += utf8.RuneCount(in) - utf8.RuneCount(result)
+			netrunes += util.CharacterCount(in) - util.CharacterCount(result)
 			return result
 		})

 		from := Loc{charpos, i}
-		to := Loc{charpos + utf8.RuneCount(l), i}
+		to := Loc{charpos + util.CharacterCount(l), i}

 		deltas = append(deltas, Delta{newText, from, to})
 	}
--- a/internal/buffer/serialize.go
+++ b/internal/buffer/serialize.go
@@ -10,8 +10,8 @@ import (

 	"golang.org/x/text/encoding"

-	"github.com/zyedidia/micro/internal/config"
-	"github.com/zyedidia/micro/internal/util"
+	"github.com/zyedidia/micro/v2/internal/config"
+	"github.com/zyedidia/micro/v2/internal/util"
 )

 // The SerializedBuffer holds the types that get serialized when a buffer is saved
--- a/internal/buffer/settings.go
+++ b/internal/buffer/settings.go
@@ -1,8 +1,8 @@
 package buffer

 import (
-	"github.com/zyedidia/micro/internal/config"
-	"github.com/zyedidia/micro/internal/screen"
+	"github.com/zyedidia/micro/v2/internal/config"
+	"github.com/zyedidia/micro/v2/internal/screen"
 )

 func (b *Buffer) SetOptionNative(option string, nativeValue interface{}) error {
--- a/internal/config/colorscheme.go
+++ b/internal/config/colorscheme.go
@@ -151,6 +151,9 @@ func StringToStyle(str string) tcell.Style {
 	if strings.Contains(str, "bold") {
 		style = style.Bold(true)
 	}
+	if strings.Contains(str, "italic") {
+		style = style.Italic(true)
+	}
 	if strings.Contains(str, "reverse") {
 		style = style.Reverse(true)
 	}
--- a/internal/config/plugin.go
+++ b/internal/config/plugin.go
@@ -5,7 +5,7 @@ import (
 	"log"

 	lua "github.com/yuin/gopher-lua"
-	ulua "github.com/zyedidia/micro/internal/lua"
+	ulua "github.com/zyedidia/micro/v2/internal/lua"
 )

 // ErrNoSuchFunction is returned when Call is executed on a function that does not exist
--- a/internal/config/plugin_installer.go
+++ b/internal/config/plugin_installer.go
@@ -16,8 +16,8 @@ import (
 	"github.com/blang/semver"
 	lua "github.com/yuin/gopher-lua"
 	"github.com/zyedidia/json5"
-	ulua "github.com/zyedidia/micro/internal/lua"
-	"github.com/zyedidia/micro/internal/util"
+	ulua "github.com/zyedidia/micro/v2/internal/lua"
+	"github.com/zyedidia/micro/v2/internal/util"
 )

 var (
--- a/internal/config/runtime.go
+++ b/internal/config/runtime.go
--- a/internal/config/settings.go
+++ b/internal/config/settings.go
@@ -12,7 +12,7 @@ import (

 	"github.com/zyedidia/glob"
 	"github.com/zyedidia/json5"
-	"github.com/zyedidia/micro/internal/util"
+	"github.com/zyedidia/micro/v2/internal/util"
 	"golang.org/x/text/encoding/htmlindex"
 )

@@ -248,6 +248,8 @@ func DefaultCommonSettings() map[string]interface{} {
 var DefaultGlobalOnlySettings = map[string]interface{}{
 	"autosave":       float64(0),
 	"colorscheme":    "default",
+	"divchars":       "|-",
+	"divreverse":     true,
 	"infobar":        true,
 	"keymenu":        false,
 	"mouse":          true,
--- a/internal/display/bufwindow.go
+++ b/internal/display/bufwindow.go
@@ -2,13 +2,12 @@ package display

 import (
 	"strconv"
-	"unicode/utf8"

 	runewidth "github.com/mattn/go-runewidth"
-	"github.com/zyedidia/micro/internal/buffer"
-	"github.com/zyedidia/micro/internal/config"
-	"github.com/zyedidia/micro/internal/screen"
-	"github.com/zyedidia/micro/internal/util"
+	"github.com/zyedidia/micro/v2/internal/buffer"
+	"github.com/zyedidia/micro/v2/internal/config"
+	"github.com/zyedidia/micro/v2/internal/screen"
+	"github.com/zyedidia/micro/v2/internal/util"
 	"github.com/zyedidia/tcell"
 )

@@ -73,9 +72,9 @@ func (w *BufWindow) getStartInfo(n, lineN int) ([]byte, int, int, *tcell.Style)
 	curStyle := config.DefStyle
 	var s *tcell.Style
 	for len(b) > 0 {
-		r, size := utf8.DecodeRune(b)
+		r, _, size := util.DecodeCharacter(b)

-		curStyle, found := w.getStyle(curStyle, bloc, r)
+		curStyle, found := w.getStyle(curStyle, bloc)
 		if found {
 			s = &curStyle
 		}
@@ -139,9 +138,6 @@ func (w *BufWindow) Relocate() bool {
 	ret := false
 	activeC := w.Buf.GetActiveCursor()
 	cy := activeC.Y
-	if activeC.HasSelection() {
-		cy = activeC.CurSelection[0].Y
-	}
 	scrollmargin := int(b.Settings["scrollmargin"].(float64))
 	if cy < w.StartLine+scrollmargin && cy > scrollmargin-1 {
 		w.StartLine = cy - scrollmargin
@@ -240,7 +236,7 @@ func (w *BufWindow) LocFromVisual(svloc buffer.Loc) buffer.Loc {
 				return bloc
 			}

-			r, size := utf8.DecodeRune(line)
+			r, _, size := util.DecodeCharacter(line)
 			draw()
 			width := 0

@@ -363,7 +359,7 @@ func (w *BufWindow) drawLineNum(lineNumStyle tcell.Style, softwrapped bool, maxL

 // getStyle returns the highlight style for the given character position
 // If there is no change to the current highlight style it just returns that
-func (w *BufWindow) getStyle(style tcell.Style, bloc buffer.Loc, r rune) (tcell.Style, bool) {
+func (w *BufWindow) getStyle(style tcell.Style, bloc buffer.Loc) (tcell.Style, bool) {
 	if group, ok := w.Buf.Match(bloc.Y)[bloc.X]; ok {
 		s := config.GetColor(group.String())
 		return s, true
@@ -513,7 +509,7 @@ func (w *BufWindow) displayBuffer() {
 		}
 		bloc.X = bslice

-		draw := func(r rune, style tcell.Style, showcursor bool) {
+		draw := func(r rune, combc []rune, style tcell.Style, showcursor bool) {
 			if nColsBeforeStart <= 0 {
 				for _, c := range cursors {
 					if c.HasSelection() &&
@@ -571,7 +567,7 @@ func (w *BufWindow) displayBuffer() {
 					}
 				}

-				screen.SetContent(w.X+vloc.X, w.Y+vloc.Y, r, nil, style)
+				screen.SetContent(w.X+vloc.X, w.Y+vloc.Y, r, combc, style)

 				if showcursor {
 					for _, c := range cursors {
@@ -587,10 +583,11 @@ func (w *BufWindow) displayBuffer() {

 		totalwidth := w.StartCol - nColsBeforeStart
 		for len(line) > 0 {
-			r, size := utf8.DecodeRune(line)
-			curStyle, _ = w.getStyle(curStyle, bloc, r)
+			r, combc, size := util.DecodeCharacter(line)

-			draw(r, curStyle, true)
+			curStyle, _ = w.getStyle(curStyle, bloc)
+
+			draw(r, combc, curStyle, true)

 			width := 0

@@ -607,7 +604,7 @@ func (w *BufWindow) displayBuffer() {
 			// Draw any extra characters either spaces for tabs or @ for incomplete wide runes
 			if width > 1 {
 				for i := 1; i < width; i++ {
-					draw(char, curStyle, false)
+					draw(char, nil, curStyle, false)
 				}
 			}
 			bloc.X++
@@ -662,7 +659,7 @@ func (w *BufWindow) displayBuffer() {
 		}

 		if vloc.X != bufWidth {
-			draw(' ', curStyle, true)
+			draw(' ', nil, curStyle, true)
 		}

 		bloc.X = w.StartCol
@@ -685,8 +682,27 @@ func (w *BufWindow) displayStatusLine() {
 		w.sline.Display()
 	} else if w.Y+w.Height != infoY {
 		w.drawStatus = true
+
+		divchars := config.GetGlobalOption("divchars").(string)
+		if util.CharacterCountInString(divchars) != 2 {
+			divchars = "|-"
+		}
+
+		_, _, size := util.DecodeCharacterInString(divchars)
+		divchar, combc, _ := util.DecodeCharacterInString(divchars[size:])
+
+		dividerStyle := config.DefStyle
+		if style, ok := config.Colorscheme["divider"]; ok {
+			dividerStyle = style
+		}
+
+		divreverse := config.GetGlobalOption("divreverse").(bool)
+		if divreverse {
+			dividerStyle = dividerStyle.Reverse(true)
+		}
+
 		for x := w.X; x < w.X+w.Width; x++ {
-			screen.SetContent(x, w.Y+w.Height-1, '-', nil, config.DefStyle.Reverse(true))
+			screen.SetContent(x, w.Y+w.Height-1, divchar, combc, dividerStyle)
 		}
 	} else {
 		w.drawStatus = false
--- a/internal/display/infowindow.go
+++ b/internal/display/infowindow.go
@@ -1,14 +1,12 @@
 package display

 import (
-	"unicode/utf8"
-
 	runewidth "github.com/mattn/go-runewidth"
-	"github.com/zyedidia/micro/internal/buffer"
-	"github.com/zyedidia/micro/internal/config"
-	"github.com/zyedidia/micro/internal/info"
-	"github.com/zyedidia/micro/internal/screen"
-	"github.com/zyedidia/micro/internal/util"
+	"github.com/zyedidia/micro/v2/internal/buffer"
+	"github.com/zyedidia/micro/v2/internal/config"
+	"github.com/zyedidia/micro/v2/internal/info"
+	"github.com/zyedidia/micro/v2/internal/screen"
+	"github.com/zyedidia/micro/v2/internal/util"
 	"github.com/zyedidia/tcell"
 )

@@ -70,7 +68,7 @@ func (i *InfoWindow) IsActive() bool   { return true }
 func (i *InfoWindow) LocFromVisual(vloc buffer.Loc) buffer.Loc {
 	c := i.Buffer.GetActiveCursor()
 	l := i.Buffer.LineBytes(0)
-	n := utf8.RuneCountInString(i.Msg)
+	n := util.CharacterCountInString(i.Msg)
 	return buffer.Loc{c.GetCharPosInLine(l, vloc.X-n), 0}
 }

@@ -86,13 +84,13 @@ func (i *InfoWindow) displayBuffer() {
 	activeC := b.GetActiveCursor()

 	blocX := 0
-	vlocX := utf8.RuneCountInString(i.Msg)
+	vlocX := util.CharacterCountInString(i.Msg)

 	tabsize := 4
 	line, nColsBeforeStart, bslice := util.SliceVisualEnd(line, blocX, tabsize)
 	blocX = bslice

-	draw := func(r rune, style tcell.Style) {
+	draw := func(r rune, combc []rune, style tcell.Style) {
 		if nColsBeforeStart <= 0 {
 			bloc := buffer.Loc{X: blocX, Y: 0}
 			if activeC.HasSelection() &&
@@ -112,8 +110,9 @@ func (i *InfoWindow) displayBuffer() {
 				c := r
 				if j > 0 {
 					c = ' '
+					combc = nil
 				}
-				screen.SetContent(vlocX, i.Y, c, nil, style)
+				screen.SetContent(vlocX, i.Y, c, combc, style)
 			}
 			vlocX++
 		}
@@ -124,9 +123,9 @@ func (i *InfoWindow) displayBuffer() {
 	for len(line) > 0 {
 		curVX := vlocX
 		curBX := blocX
-		r, size := utf8.DecodeRune(line)
+		r, combc, size := util.DecodeCharacter(line)

-		draw(r, i.defStyle())
+		draw(r, combc, i.defStyle())

 		width := 0

@@ -146,7 +145,7 @@ func (i *InfoWindow) displayBuffer() {
 		// Draw any extra characters either spaces for tabs or @ for incomplete wide runes
 		if width > 1 {
 			for j := 1; j < width; j++ {
-				draw(char, i.defStyle())
+				draw(char, nil, i.defStyle())
 			}
 		}
 		if activeC.X == curBX {
@@ -191,7 +190,7 @@ func (i *InfoWindow) scrollToSuggestion() {
 	s := i.totalSize()

 	for j, n := range i.Suggestions {
-		c := utf8.RuneCountInString(n)
+		c := util.CharacterCountInString(n)
 		if j == i.CurSuggestion {
 			if x+c >= i.hscroll+i.Width {
 				i.hscroll = util.Clamp(x+c+1-i.Width, 0, s-i.Width)
--- a/internal/display/statusline.go
+++ b/internal/display/statusline.go
@@ -6,17 +6,16 @@ import (
 	"regexp"
 	"strconv"
 	"strings"
-	"unicode/utf8"

 	luar "layeh.com/gopher-luar"

 	runewidth "github.com/mattn/go-runewidth"
 	lua "github.com/yuin/gopher-lua"
-	"github.com/zyedidia/micro/internal/buffer"
-	"github.com/zyedidia/micro/internal/config"
-	ulua "github.com/zyedidia/micro/internal/lua"
-	"github.com/zyedidia/micro/internal/screen"
-	"github.com/zyedidia/micro/internal/util"
+	"github.com/zyedidia/micro/v2/internal/buffer"
+	"github.com/zyedidia/micro/v2/internal/config"
+	ulua "github.com/zyedidia/micro/v2/internal/lua"
+	"github.com/zyedidia/micro/v2/internal/screen"
+	"github.com/zyedidia/micro/v2/internal/util"
 )

 // StatusLine represents the information line at the bottom
@@ -168,34 +167,36 @@ func (s *StatusLine) Display() {
 		statusLineStyle = style
 	}

-	leftLen := util.StringWidth(leftText, utf8.RuneCount(leftText), 1)
-	rightLen := util.StringWidth(rightText, utf8.RuneCount(rightText), 1)
+	leftLen := util.StringWidth(leftText, util.CharacterCount(leftText), 1)
+	rightLen := util.StringWidth(rightText, util.CharacterCount(rightText), 1)

 	winX := s.win.X
 	for x := 0; x < s.win.Width; x++ {
 		if x < leftLen {
-			r, size := utf8.DecodeRune(leftText)
+			r, combc, size := util.DecodeCharacter(leftText)
 			leftText = leftText[size:]
 			rw := runewidth.RuneWidth(r)
 			for j := 0; j < rw; j++ {
 				c := r
 				if j > 0 {
 					c = ' '
+					combc = nil
 					x++
 				}
-				screen.SetContent(winX+x, y, c, nil, statusLineStyle)
+				screen.SetContent(winX+x, y, c, combc, statusLineStyle)
 			}
 		} else if x >= s.win.Width-rightLen && x < rightLen+s.win.Width-rightLen {
-			r, size := utf8.DecodeRune(rightText)
+			r, combc, size := util.DecodeCharacter(rightText)
 			rightText = rightText[size:]
 			rw := runewidth.RuneWidth(r)
 			for j := 0; j < rw; j++ {
 				c := r
 				if j > 0 {
 					c = ' '
+					combc = nil
 					x++
 				}
-				screen.SetContent(winX+x, y, c, nil, statusLineStyle)
+				screen.SetContent(winX+x, y, c, combc, statusLineStyle)
 			}
 		} else {
 			screen.SetContent(winX+x, y, ' ', nil, statusLineStyle)
--- a/internal/display/tabwindow.go
+++ b/internal/display/tabwindow.go
@@ -1,13 +1,11 @@
 package display

 import (
-	"unicode/utf8"
-
 	runewidth "github.com/mattn/go-runewidth"
-	"github.com/zyedidia/micro/internal/buffer"
-	"github.com/zyedidia/micro/internal/config"
-	"github.com/zyedidia/micro/internal/screen"
-	"github.com/zyedidia/micro/internal/util"
+	"github.com/zyedidia/micro/v2/internal/buffer"
+	"github.com/zyedidia/micro/v2/internal/config"
+	"github.com/zyedidia/micro/v2/internal/screen"
+	"github.com/zyedidia/micro/v2/internal/util"
 )

 type TabWindow struct {
@@ -34,7 +32,7 @@ func (w *TabWindow) LocFromVisual(vloc buffer.Loc) int {

 	for i, n := range w.Names {
 		x++
-		s := utf8.RuneCountInString(n)
+		s := util.CharacterCountInString(n)
 		if vloc.Y == w.Y && vloc.X < x+s {
 			return i
 		}
@@ -75,7 +73,7 @@ func (w *TabWindow) SetActive(a int) {
 	s := w.TotalSize()

 	for i, n := range w.Names {
-		c := utf8.RuneCountInString(n)
+		c := util.CharacterCountInString(n)
 		if i == a {
 			if x+c >= w.hscroll+w.Width {
 				w.hscroll = util.Clamp(x+c+1-w.Width, 0, s-w.Width)
--- a/internal/display/termwindow.go
+++ b/internal/display/termwindow.go
@@ -1,12 +1,11 @@
 package display

 import (
-	"unicode/utf8"
-
-	"github.com/zyedidia/micro/internal/buffer"
-	"github.com/zyedidia/micro/internal/config"
-	"github.com/zyedidia/micro/internal/screen"
-	"github.com/zyedidia/micro/internal/shell"
+	"github.com/zyedidia/micro/v2/internal/buffer"
+	"github.com/zyedidia/micro/v2/internal/config"
+	"github.com/zyedidia/micro/v2/internal/screen"
+	"github.com/zyedidia/micro/v2/internal/shell"
+	"github.com/zyedidia/micro/v2/internal/util"
 	"github.com/zyedidia/tcell"
 	"github.com/zyedidia/terminal"
 )
@@ -98,12 +97,12 @@ func (w *TermWindow) Display() {
 		}

 		text := []byte(w.Name())
-		textLen := utf8.RuneCount(text)
+		textLen := util.CharacterCount(text)
 		for x := 0; x < w.Width; x++ {
 			if x < textLen {
-				r, size := utf8.DecodeRune(text)
+				r, combc, size := util.DecodeCharacter(text)
 				text = text[size:]
-				screen.SetContent(w.X+x, w.Y+w.Height, r, nil, statusLineStyle)
+				screen.SetContent(w.X+x, w.Y+w.Height, r, combc, statusLineStyle)
 			} else {
 				screen.SetContent(w.X+x, w.Y+w.Height, ' ', nil, statusLineStyle)
 			}
--- a/internal/display/uiwindow.go
+++ b/internal/display/uiwindow.go
@@ -1,10 +1,11 @@
 package display

 import (
-	"github.com/zyedidia/micro/internal/buffer"
-	"github.com/zyedidia/micro/internal/config"
-	"github.com/zyedidia/micro/internal/screen"
-	"github.com/zyedidia/micro/internal/views"
+	"github.com/zyedidia/micro/v2/internal/buffer"
+	"github.com/zyedidia/micro/v2/internal/config"
+	"github.com/zyedidia/micro/v2/internal/screen"
+	"github.com/zyedidia/micro/v2/internal/util"
+	"github.com/zyedidia/micro/v2/internal/views"
 )

 type UIWindow struct {
@@ -24,11 +25,23 @@ func (w *UIWindow) drawNode(n *views.Node) {
 		dividerStyle = style
 	}

+	divchars := config.GetGlobalOption("divchars").(string)
+	if util.CharacterCountInString(divchars) != 2 {
+		divchars = "|-"
+	}
+
+	divchar, combc, _ := util.DecodeCharacterInString(divchars)
+
+	divreverse := config.GetGlobalOption("divreverse").(bool)
+	if divreverse {
+		dividerStyle = dividerStyle.Reverse(true)
+	}
+
 	for i, c := range cs {
 		if c.IsLeaf() && c.Kind == views.STVert {
 			if i != len(cs)-1 {
 				for h := 0; h < c.H; h++ {
-					screen.SetContent(c.X+c.W, c.Y+h, '|', nil, dividerStyle.Reverse(true))
+					screen.SetContent(c.X+c.W, c.Y+h, divchar, combc, dividerStyle)
 				}
 			}
 		} else {
--- a/internal/display/window.go
+++ b/internal/display/window.go
@@ -1,7 +1,7 @@
 package display

 import (
-	"github.com/zyedidia/micro/internal/buffer"
+	"github.com/zyedidia/micro/v2/internal/buffer"
 )

 type View struct {
--- a/internal/info/history.go
+++ b/internal/info/history.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"path/filepath"

-	"github.com/zyedidia/micro/internal/config"
+	"github.com/zyedidia/micro/v2/internal/config"
 )

 // LoadHistory attempts to load user history from configDir/buffers/history
--- a/internal/info/infobuffer.go
+++ b/internal/info/infobuffer.go
@@ -3,7 +3,7 @@ package info
 import (
 	"fmt"

-	"github.com/zyedidia/micro/internal/buffer"
+	"github.com/zyedidia/micro/v2/internal/buffer"
 )

 // The InfoBuf displays messages and other info at the bottom of the screen.
--- a/internal/screen/screen.go
+++ b/internal/screen/screen.go
@@ -5,8 +5,8 @@ import (
 	"os"
 	"sync"

-	"github.com/zyedidia/micro/internal/config"
-	"github.com/zyedidia/micro/internal/util"
+	"github.com/zyedidia/micro/v2/internal/config"
+	"github.com/zyedidia/micro/v2/internal/util"
 	"github.com/zyedidia/tcell"
 )

@@ -127,7 +127,7 @@ func TempStart(screenWasNil bool) {

 // Init creates and initializes the tcell screen
 func Init() {
-	drawChan = make(chan bool)
+	drawChan = make(chan bool, 8)

 	// Should we enable true color?
 	truecolor := os.Getenv("MICRO_TRUECOLOR") == "1"
--- a/internal/shell/shell.go
+++ b/internal/shell/shell.go
@@ -11,7 +11,7 @@ import (
 	"strings"

 	shellquote "github.com/kballard/go-shellquote"
-	"github.com/zyedidia/micro/internal/screen"
+	"github.com/zyedidia/micro/v2/internal/screen"
 )

 // ExecCommand executes a command using exec
--- a/internal/shell/terminal.go
+++ b/internal/shell/terminal.go
@@ -5,8 +5,8 @@ import (
 	"os/exec"
 	"strconv"

-	"github.com/zyedidia/micro/internal/buffer"
-	"github.com/zyedidia/micro/internal/screen"
+	"github.com/zyedidia/micro/v2/internal/buffer"
+	"github.com/zyedidia/micro/v2/internal/screen"
 	"github.com/zyedidia/terminal"
 )

--- a/internal/util/lua.go
+++ b/internal/util/lua.go
@@ -1,15 +1,11 @@
 package util

-import (
-	"unicode/utf8"
-)
-
 // LuaRuneAt is a helper function for lua plugins to return the rune
 // at an index within a string
 func LuaRuneAt(str string, runeidx int) string {
 	i := 0
 	for len(str) > 0 {
-		r, size := utf8.DecodeRuneInString(str)
+		r, _, size := DecodeCharacterInString(str)

 		str = str[size:]

@@ -26,7 +22,7 @@ func LuaRuneAt(str string, runeidx int) string {
 func LuaGetLeadingWhitespace(s string) string {
 	ws := []byte{}
 	for len(s) > 0 {
-		r, size := utf8.DecodeRuneInString(s)
+		r, _, size := DecodeCharacterInString(s)
 		if r == ' ' || r == '\t' {
 			ws = append(ws, byte(r))
 		} else {
@@ -40,6 +36,6 @@ func LuaGetLeadingWhitespace(s string) string {

 // LuaIsWordChar returns true if the first rune in a string is a word character
 func LuaIsWordChar(s string) bool {
-	r, _ := utf8.DecodeRuneInString(s)
+	r, _, _ := DecodeCharacterInString(s)
 	return IsWordChar(r)
 }
--- a/internal/util/unicode.go
+++ b/internal/util/unicode.go
@@ -0,0 +1,86 @@
+package util
+
+import (
+	"unicode"
+	"unicode/utf8"
+)
+
+// Unicode is annoying. A "code point" (rune in Go-speak) may need up to
+// 4 bytes to represent it. In general, a code point will represent a
+// complete character, but this is not always the case. A character with
+// accents may be made up of multiple code points (the code point for the
+// original character, and additional code points for each accent/marking).
+// The functions below are meant to help deal with these additional "combining"
+// code points. In underlying operations (search, replace, etc...), micro will
+// treat a character with combining code points as just the original code point.
+// For rendering, micro will display the combining characters. It's not perfect
+// but it's pretty good.
+
+// DecodeCharacter returns the next character from an array of bytes
+// A character is a rune along with any accompanying combining runes
+func DecodeCharacter(b []byte) (rune, []rune, int) {
+	r, size := utf8.DecodeRune(b)
+	b = b[size:]
+	c, s := utf8.DecodeRune(b)
+
+	var combc []rune
+	for unicode.In(c, unicode.Mark) {
+		combc = append(combc, c)
+		size += s
+
+		b = b[s:]
+		c, s = utf8.DecodeRune(b)
+	}
+
+	return r, combc, size
+}
+
+// DecodeCharacterInString returns the next character from a string
+// A character is a rune along with any accompanying combining runes
+func DecodeCharacterInString(str string) (rune, []rune, int) {
+	r, size := utf8.DecodeRuneInString(str)
+	str = str[size:]
+	c, s := utf8.DecodeRuneInString(str)
+
+	var combc []rune
+	for unicode.In(c, unicode.Mark) {
+		combc = append(combc, c)
+		size += s
+
+		str = str[s:]
+		c, s = utf8.DecodeRuneInString(str)
+	}
+
+	return r, combc, size
+}
+
+// CharacterCount returns the number of characters in a byte array
+// Similar to utf8.RuneCount but for unicode characters
+func CharacterCount(b []byte) int {
+	s := 0
+
+	for len(b) > 0 {
+		r, size := utf8.DecodeRune(b)
+		if !unicode.In(r, unicode.Mark) {
+			s++
+		}
+
+		b = b[size:]
+	}
+
+	return s
+}
+
+// CharacterCount returns the number of characters in a string
+// Similar to utf8.RuneCountInString but for unicode characters
+func CharacterCountInString(str string) int {
+	s := 0
+
+	for _, r := range str {
+		if !unicode.In(r, unicode.Mark) {
+			s++
+		}
+	}
+
+	return s
+}
--- a/internal/util/util.go
+++ b/internal/util/util.go
@@ -13,7 +13,6 @@ import (
 	"strings"
 	"time"
 	"unicode"
-	"unicode/utf8"

 	"github.com/blang/semver"
 	runewidth "github.com/mattn/go-runewidth"
@@ -64,7 +63,7 @@ func SliceEnd(slc []byte, index int) []byte {
 			return slc[totalSize:]
 		}

-		_, size := utf8.DecodeRune(slc[totalSize:])
+		_, _, size := DecodeCharacter(slc[totalSize:])
 		totalSize += size
 		i++
 	}
@@ -82,7 +81,7 @@ func SliceEndStr(str string, index int) string {
 			return str[totalSize:]
 		}

-		_, size := utf8.DecodeRuneInString(str[totalSize:])
+		_, _, size := DecodeCharacterInString(str[totalSize:])
 		totalSize += size
 		i++
 	}
@@ -101,7 +100,7 @@ func SliceStart(slc []byte, index int) []byte {
 			return slc[:totalSize]
 		}

-		_, size := utf8.DecodeRune(slc[totalSize:])
+		_, _, size := DecodeCharacter(slc[totalSize:])
 		totalSize += size
 		i++
 	}
@@ -119,7 +118,7 @@ func SliceStartStr(str string, index int) string {
 			return str[:totalSize]
 		}

-		_, size := utf8.DecodeRuneInString(str[totalSize:])
+		_, _, size := DecodeCharacterInString(str[totalSize:])
 		totalSize += size
 		i++
 	}
@@ -135,7 +134,7 @@ func SliceVisualEnd(b []byte, n, tabsize int) ([]byte, int, int) {
 	width := 0
 	i := 0
 	for len(b) > 0 {
-		r, size := utf8.DecodeRune(b)
+		r, _, size := DecodeCharacter(b)

 		w := 0
 		switch r {
@@ -172,7 +171,7 @@ func StringWidth(b []byte, n, tabsize int) int {
 	i := 0
 	width := 0
 	for len(b) > 0 {
-		r, size := utf8.DecodeRune(b)
+		r, _, size := DecodeCharacter(b)
 		b = b[size:]

 		switch r {
@@ -265,7 +264,7 @@ func IsBytesWhitespace(b []byte) bool {
 // RunePos returns the rune index of a given byte index
 // Make sure the byte index is not between code points
 func RunePos(b []byte, i int) int {
-	return utf8.RuneCount(b[:i])
+	return CharacterCount(b[:i])
 }

 // MakeRelative will attempt to make a relative path between path and base
@@ -344,7 +343,7 @@ func EscapePath(path string) string {
 func GetLeadingWhitespace(b []byte) []byte {
 	ws := []byte{}
 	for len(b) > 0 {
-		r, size := utf8.DecodeRune(b)
+		r, _, size := DecodeCharacter(b)
 		if r == ' ' || r == '\t' {
 			ws = append(ws, byte(r))
 		} else {
@@ -370,7 +369,7 @@ func GetCharPosInLine(b []byte, visualPos int, tabsize int) int {
 	i := 0     // char pos
 	width := 0 // string visual width
 	for len(b) > 0 {
-		r, size := utf8.DecodeRune(b)
+		r, _, size := DecodeCharacter(b)
 		b = b[size:]

 		switch r {
@@ -416,7 +415,7 @@ func Clamp(val, min, max int) int {
 }

 func IsNonAlphaNumeric(c rune) bool {
-	return !unicode.IsLetter(c) && !unicode.IsNumber(c)
+	return !unicode.IsLetter(c) && !unicode.IsNumber(c) && c != '_'
 }

 func ParseSpecial(s string) string {
--- a/pkg/highlight/highlighter.go
+++ b/pkg/highlight/highlighter.go
@@ -3,7 +3,6 @@ package highlight
 import (
 	"regexp"
 	"strings"
-	"unicode/utf8"
 )

 func sliceStart(slc []byte, index int) []byte {
@@ -15,7 +14,7 @@ func sliceStart(slc []byte, index int) []byte {
 			return slc[totalSize:]
 		}

-		_, size := utf8.DecodeRune(slc[totalSize:])
+		_, _, size := DecodeCharacter(slc[totalSize:])
 		totalSize += size
 		i++
 	}
@@ -32,7 +31,7 @@ func sliceEnd(slc []byte, index int) []byte {
 			return slc[:totalSize]
 		}

-		_, size := utf8.DecodeRune(slc[totalSize:])
+		_, _, size := DecodeCharacter(slc[totalSize:])
 		totalSize += size
 		i++
 	}
@@ -47,9 +46,9 @@ func runePos(p int, str []byte) int {
 		return 0
 	}
 	if p >= len(str) {
-		return utf8.RuneCount(str)
+		return CharacterCount(str)
 	}
-	return utf8.RuneCount(str[:p])
+	return CharacterCount(str[:p])
 }

 func combineLineMatch(src, dst LineMatch) LineMatch {
@@ -112,7 +111,7 @@ func findIndex(regex *regexp.Regexp, skip *regexp.Regexp, str []byte, canMatchSt
 	var strbytes []byte
 	if skip != nil {
 		strbytes = skip.ReplaceAllFunc(str, func(match []byte) []byte {
-			res := make([]byte, utf8.RuneCount(match))
+			res := make([]byte, CharacterCount(match))
 			return res
 		})
 	} else {
@@ -148,7 +147,7 @@ func findAllIndex(regex *regexp.Regexp, str []byte, canMatchStart, canMatchEnd b
 }

 func (h *Highlighter) highlightRegion(highlights LineMatch, start int, canMatchEnd bool, lineNum int, line []byte, curRegion *region, statesOnly bool) LineMatch {
-	lineLen := utf8.RuneCount(line)
+	lineLen := CharacterCount(line)
 	if start == 0 {
 		if !statesOnly {
 			if _, ok := highlights[0]; !ok {
@@ -236,7 +235,7 @@ func (h *Highlighter) highlightRegion(highlights LineMatch, start int, canMatchE
 }

 func (h *Highlighter) highlightEmptyRegion(highlights LineMatch, start int, canMatchEnd bool, lineNum int, line []byte, statesOnly bool) LineMatch {
-	lineLen := utf8.RuneCount(line)
+	lineLen := CharacterCount(line)
 	if lineLen == 0 {
 		if canMatchEnd {
 			h.lastRegion = nil
@@ -336,11 +335,11 @@ func (h *Highlighter) HighlightStates(input LineStates) {
 	}
 }

-// HighlightMatches sets the matches for each line in between startline and endline
+// HighlightMatches sets the matches for each line from startline to endline
 // It sets all other matches in the buffer to nil to conserve memory
 // This assumes that all the states are set correctly
 func (h *Highlighter) HighlightMatches(input LineStates, startline, endline int) {
-	for i := startline; i < endline; i++ {
+	for i := startline; i <= endline; i++ {
 		if i >= input.LinesNum() {
 			break
 		}
--- a/pkg/highlight/unicode.go
+++ b/pkg/highlight/unicode.go
@@ -0,0 +1,75 @@
+package highlight
+
+import (
+	"unicode"
+	"unicode/utf8"
+)
+
+// DecodeCharacter returns the next character from an array of bytes
+// A character is a rune along with any accompanying combining runes
+func DecodeCharacter(b []byte) (rune, []rune, int) {
+	r, size := utf8.DecodeRune(b)
+	b = b[size:]
+	c, s := utf8.DecodeRune(b)
+
+	var combc []rune
+	for unicode.In(c, unicode.Mark) {
+		combc = append(combc, c)
+		size += s
+
+		b = b[s:]
+		c, s = utf8.DecodeRune(b)
+	}
+
+	return r, combc, size
+}
+
+// DecodeCharacterInString returns the next character from a string
+// A character is a rune along with any accompanying combining runes
+func DecodeCharacterInString(str string) (rune, []rune, int) {
+	r, size := utf8.DecodeRuneInString(str)
+	str = str[size:]
+	c, s := utf8.DecodeRuneInString(str)
+
+	var combc []rune
+	for unicode.In(c, unicode.Mark) {
+		combc = append(combc, c)
+		size += s
+
+		str = str[s:]
+		c, s = utf8.DecodeRuneInString(str)
+	}
+
+	return r, combc, size
+}
+
+// CharacterCount returns the number of characters in a byte array
+// Similar to utf8.RuneCount but for unicode characters
+func CharacterCount(b []byte) int {
+	s := 0
+
+	for len(b) > 0 {
+		r, size := utf8.DecodeRune(b)
+		if !unicode.In(r, unicode.Mark) {
+			s++
+		}
+
+		b = b[size:]
+	}
+
+	return s
+}
+
+// CharacterCount returns the number of characters in a string
+// Similar to utf8.RuneCountInString but for unicode characters
+func CharacterCountInString(str string) int {
+	s := 0
+
+	for _, r := range str {
+		if !unicode.In(r, unicode.Mark) {
+			s++
+		}
+	}
+
+	return s
+}
--- a/runtime/help/colors.md
+++ b/runtime/help/colors.md
@@ -132,7 +132,7 @@ If you would like no foreground you can just use a comma with nothing in front:
 color-link comment ",blue"
 ```

-You can also put bold, or underline in front of the color:
+You can also put bold, italic, or underline in front of the color:

 ```
 color-link comment "bold red"
--- a/runtime/help/commands.md
+++ b/runtime/help/commands.md
@@ -62,6 +62,11 @@ quotes here but these are not necessary when entering the command in micro.

 * `tab 'filename'`: opens the given file in a new tab.

+* `tabmove '[-+]?n'`: Moves the active tab to another slot. `n` is an integer.
+   If `n` is prefixed with `-` or `+`, then it represents a relative position
+   (e.g. `tabmove +2` moves the tab to the right by `2`). If `n` has no prefix,
+   it represents an absolute position (e.g. `tabmove 2` moves the tab to slot `2`).
+
 * `tabswitch 'tab'`: This command will switch to the specified tab. The `tab`
   can either be a tab number, or a name of a tab.

--- a/runtime/help/keybindings.md
+++ b/runtime/help/keybindings.md
@@ -185,11 +185,13 @@ Save
 SaveAll
 SaveAs
 Find
+FindLiteral
 FindNext
 FindPrevious
 Undo
 Redo
 Copy
+CopyLine
 Cut
 CutLine
 DuplicateLine
@@ -455,7 +457,7 @@ conventions for text editing defaults.
    "CtrlP":          "FindPrevious",
    "CtrlZ":          "Undo",
    "CtrlY":          "Redo",
-    "CtrlC":          "Copy",
+    "CtrlC":          "CopyLine|Copy",
    "CtrlX":          "Cut",
    "CtrlK":          "CutLine",
    "CtrlD":          "DuplicateLine",
--- a/runtime/help/options.md
+++ b/runtime/help/options.md
@@ -80,6 +80,21 @@ Here are the available options:

 	default value: `false`

+* `divchars`: specifies the "divider" characters used for the dividing line
+   between vertical/horizontal splits. The first character is for vertical
+   dividers, and the second is for horizontal dividers. By default, for
+   horizontal splits the statusline serves as a divider, but if the statusline
+   is disabled the horizontal divider character will be used.
+
+    default value: `|-`
+
+* `divreverse`: colorschemes provide the color (foreground and background) for
+   the characters displayed in split dividers. With this option enabled, the
+   colors specified by the colorscheme will be reversed (foreground and
+   background colors swapped).
+
+    default value: `true`
+
 * `encoding`: the encoding to open and save files with. Supported encodings
   are listed at https://www.w3.org/TR/encoding/.

--- a/runtime/plugins/autoclose/autoclose.lua
+++ b/runtime/plugins/autoclose/autoclose.lua
@@ -28,7 +28,7 @@ function onRune(bp, r)
        if r == charAt(autoclosePairs[i], 1) then
            local curLine = bp.Buf:Line(bp.Cursor.Y)

-            if bp.Cursor.X == utf8.RuneCountInString(curLine) or not uutil.IsWordChar(charAt(curLine, bp.Cursor.X+1)) then
+            if bp.Cursor.X == uutil.CharacterCountInString(curLine) or not uutil.IsWordChar(charAt(curLine, bp.Cursor.X+1)) then
                -- the '-' here is to derefence the pointer to bp.Cursor.Loc which is automatically made
                -- when converting go structs to lua
                -- It needs to be dereferenced because the function expects a non pointer struct
--- a/runtime/plugins/linter/linter.lua
+++ b/runtime/plugins/linter/linter.lua
@@ -70,7 +70,7 @@ function init()
    makeLinter("dmd", "d", "dmd", {"-color=off", "-o-", "-w", "-wi", "-c", "%f"}, "%f%(%l%):.+: %m")
    makeLinter("gobuild", "go", "go", {"build", "-o", devnull, "%d"}, "%f:%l:%c:? %m")
    -- makeLinter("golint", "go", "golint", {"%f"}, "%f:%l:%c: %m")
-    makeLinter("hlint", "haskell", "hlint", {"%f"}, "%f:%l:%c: %m")
+    makeLinter("hlint", "haskell", "hlint", {"%f"}, "%f:%l:%c.-: %m")
    makeLinter("javac", "java", "javac", {"-d", "%d", "%f"}, "%f:%l: error: %m")
    makeLinter("jshint", "javascript", "jshint", {"%f"}, "%f: line %l,.+, %m")
    makeLinter("literate", "literate", "lit", {"-c", "%f"}, "%f:%l:%m", {}, false, true)
--- a/runtime/syntax/c++.yaml
+++ b/runtime/syntax/c++.yaml
@@ -1,28 +0,0 @@
-filetype: c++
-
-detect: 
-    filename: "\\.c(c|pp|xx)$|\\.h(h|pp|xx)$|\\.ii?$|\\.(def)$"
-
-rules:
-    - identifier: "\\b[A-Z_][0-9A-Z_]+\\b"
-    - type: "\\b(auto|float|double|bool|char|int|short|long|sizeof|enum|void|static|const|constexpr|struct|union|typedef|extern|(un)?signed|inline)\\b"
-    - type: "\\b((s?size)|((u_?)?int(8|16|32|64|ptr)))_t\\b"
-    - statement: "\\b(class|namespace|template|public|protected|private|typename|this|friend|virtual|using|mutable|volatile|register|explicit)\\b"
-    - statement: "\\b(for|if|while|do|else|case|default|switch)\\b"
-    - statement: "\\b(try|throw|catch|operator|new|delete)\\b"
-    - special: "\\b(goto|continue|break|return)\\b"
-    - preproc: "^[[:space:]]*#[[:space:]]*(define|pragma|include|(un|ifn?)def|endif|el(if|se)|if|warning|error)"
-    - constant: "'([^'\\\\]|(\\\\[\"'abfnrtv\\\\]))'|'\\\\(([0-3]?[0-7]{1,2}))'|'\\\\x[0-9A-Fa-f]{1,2}'"
-    - statement: "__attribute__[[:space:]]*\\(\\([^)]*\\)\\)|__(aligned|asm|builtin|hidden|inline|packed|restrict|section|typeof|weak)__"
-    - symbol.operator: "[.:;,+*|=!\\%]|<|>|/|-|&"
-    - symbol.brackets: "[(){}]|\\[|\\]"
-    - constant.number: "\\b[0-9]+\\b|\\b0x[0-9A-Fa-f]+\\b"
-    - constant.bool: "\\b(true|false)\\b|NULL"
-    - constant.string: "\"(\\\\.|[^\"])*\""
-    - comment: "//.*"
-    - comment:
-        start: "/\\*"
-        end: "\\*/"
-        rules: []
-
-    - indent-char.whitespace: "[[:space:]]+$"
--- a/runtime/syntax/coffeescript.yaml
+++ b/runtime/syntax/coffeescript.yaml
@@ -12,6 +12,9 @@ rules:
    - statement:  "\\b(debugger|switch|while|do|class|extends|super)\\b"
    - statement:  "\\b(undefined|then|unless|until|loop|of|by|when)\\b"
    - constant.bool:  "\\b(true|false|yes|no|on|off)\\b"
+    - constant.number: "\\b[-+]?([1-9][0-9]*|0[0-7]*|0x[0-9a-fA-F]+)([uU][lL]?|[lL][uU]?)?\\b"
+    - constant.number: "\\b[-+]?([0-9]+\\.[0-9]*|[0-9]*\\.[0-9]+)([EePp][+-]?[0-9]+)?[fFlL]?"
+    - constant.number: "\\b[-+]?([0-9]+[EePp][+-]?[0-9]+)[fFlL]?"
    - identifier: "@[A-Za-z0-9_]*"

    - constant.string:
@@ -20,10 +23,23 @@ rules:
        skip: "\\\\."
        rules:
            - constant.specialChar: "\\\\."
+     
+    - constant.string:
+        start: "'"
+        end: "'"
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\."
+      

    - comment:
        start: "#"
        end: "$"
        rules:
            - todo: "(TODO|XXX|FIXME):?"
+    - comment:
+        start: "###"
+        end: "###"
+        rules:  
+            - todo: "(TODO|XXX|FIXME)"

--- a/tools/testgen.go
+++ b/tools/testgen.go
@@ -233,8 +233,6 @@ func main() {
 	re := regexp.MustCompile(`[^\w]`)
 	usedNames := map[string]bool{}

-	var b strings.Builder
-
 	for _, test := range tests {
 		name := strings.Title(strings.ToLower(test.description))
 		name = re.ReplaceAllLiteralString(name, "")
@@ -253,15 +251,5 @@ func main() {
 		usedNames[name] = true

 		fmt.Println(testToGoTest(test, name))
-
-		b.WriteString("Test")
-		b.WriteString(name)
-		b.WriteString("(nil)\n")
 	}
-
-	fmt.Println("func BenchmarkBuffer(b *testing.B) {")
-	fmt.Println("for i := 0; i < b.N; i++ {")
-	fmt.Print(b.String())
-	fmt.Println("}")
-	fmt.Println("}")
 }
Author	SHA1	Message	Date
Dmitry Maluka	c5b0c2d41f	Fix dropped redraw events (#1675 ) If screen.Redraw() is called very quickly after a key or mouse event, it may send the redraw event while micro is not waiting for it but still processing the key or mouse event. Since drawChan is non-buffered and at the same time non-blocking, this redraw event will be simply lost, so the screen content will not be up-to-date.	2020-05-23 14:59:23 -04:00
Zachary Yedidia	bd43a44194	Merge branch 'master' of https://github.com/zyedidia/micro	2020-05-21 14:36:34 -04:00
Zachary Yedidia	bfe68b1626	Allow divider customization with divchars option Adds the `divchars` and `divreverse` options to customize divider styles.	2020-05-21 14:35:54 -04:00
Zachary Yedidia	0064b8268f	Improve unicode line array test	2020-05-20 19:53:54 -04:00
Zachary Yedidia	9a22d93ea2	Expose CharacterCount to plugins	2020-05-20 18:04:00 -04:00
Zachary Yedidia	5c8a2332d9	Use unicode.Mark for combining unicode range	2020-05-20 18:01:10 -04:00
Zachary Yedidia	ff0683d6d0	Final touches for combining character support	2020-05-20 17:00:56 -04:00
Zachary Yedidia	79c0ea17ad	Use CharacterCount over RuneCount	2020-05-20 16:47:08 -04:00
Zachary Yedidia	bdff221870	Use DecodeCharacter over DecodeRune	2020-05-20 16:43:12 -04:00
Zachary Yedidia	65be5efd83	Merge branch 'p-e-w-buffer-benchmarks'	2020-05-20 15:29:02 -04:00
Zachary Yedidia	a491dd1c52	Merge branch 'buffer-benchmarks' of https://github.com/p-e-w/micro into p-e-w-buffer-benchmarks	2020-05-20 15:28:36 -04:00
Zachary Yedidia	d7ab44253f	Update tcell and support italics in colorschemes Closes #1640	2020-05-17 12:48:34 -04:00
Zachary Yedidia	0a6720498f	Merge branch 'master' of https://github.com/zyedidia/micro	2020-05-17 12:23:21 -04:00
dmaluka	a150eef6f9	Fix end line number in HighlightMatches (#1662 ) There is a bit of mess in the usage of HighlightMatches: in some places we assume that it updates lines from startline to endline inclusive, in other places we assume it's non-inclusive. This fix makes it always inclusive. In particular, it fixes a bug: when we open a file which has no newline at the end, the last line isn't highlighted.	2020-05-17 16:05:34 -04:00
Zachary Yedidia	c46257222c	Add support for FindLiteral Use the FindLiteral action to use Find without regex support. Fixes #1661	2020-05-17 12:22:33 -04:00
jsyedidia	299af4a3db	Update hlint to 3.0 syntax (#1659 )	2020-05-16 13:06:55 -04:00
Jeff Warner	d0f7ecf9ca	Adds command "tabmove ±n", for better tab management (#1636 ) * Adds command "tabmove ±n", for better tab management * Added tabmove to help:commands * Replace uses of util.Min, util.Max with util.Clamp Browsing code and discovered `util.Clamp`, ideal for this section of my code * oops, missed an arg * Typo, again	2020-05-14 21:51:49 -04:00
dmaluka	fb35e0312a	Fix unbind of a rune (#1649 ) Fix problem with non-working unbind of a rune key. E.g. after the following commands: bind "n" "FindNext" unbind "n" Observed result: "n" key still triggers FindNext action Expected result: "n" key inserts "n" rune	2020-05-14 21:50:28 -04:00
Zachary Yedidia	30395b1f67	Remove outdated c++ highlighter Fixes #1652	2020-05-14 21:37:19 -04:00
Zachary Yedidia	ddf70953fe	Support snake case autocompletion Fixes #1655	2020-05-14 21:34:17 -04:00
Zachary Yedidia	55e97596d3	Fix movelinesup when selection is not complete	2020-05-07 19:39:17 -04:00
Zachary Yedidia	66dc48ce9b	Improve readme	2020-05-04 22:21:46 -04:00
Zachary Yedidia	c490a94700	Update makefile	2020-05-04 10:34:16 -04:00
Zachary Yedidia	eff89a98a7	Fix v2 import path for go mod	2020-05-04 10:16:15 -04:00
Zachary Yedidia	221d8f462a	Merge branch 'jwarner112-jwarner112-copyline'	2020-04-30 00:54:11 -04:00
Zachary Yedidia	7a23878250	gofmt	2020-04-30 00:54:02 -04:00
Jeff Warner	5d3e4fc3d9	Adds CopyLine action, the new default action for CtrlC if cursor has no selection	2020-04-29 21:06:54 -07:00
Indiana Kernick	f52fbfa1f0	Add .inl as a C++ file extension (#1630 )	2020-04-29 20:01:59 -04:00
Zachary Yedidia	d60626c64b	Merge	2020-04-25 17:01:20 -04:00
Zachary Yedidia	aaac0b1e6f	Better actions error message	2020-04-25 17:01:16 -04:00
Some person	0f984131fb	Update coffeescript.yaml (#1571 ) * Update coffeescript.yaml We need much much more modern coffeescript standards, the current one has broken `0x123456` (hex) and single quotes, and doesn't support multiline comments. This PR aims to fix that. I'm no regexp expert, I just based this off JS', so tell me if I did anything wrong. * Update coffeescript.yaml	2020-04-22 23:12:56 -04:00
Zachary Yedidia	eb7189dcdb	Make cursor follow selections Fixes #1624	2020-04-21 09:33:21 -04:00
Zachary Yedidia	74523d28c5	Merge	2020-04-20 23:13:10 -04:00
Zachary Yedidia	f894f0a26e	Update clipboard version	2020-04-20 23:13:01 -04:00
2pac	a067ce1f41	implemented circular tab movement (#1619 ) Co-authored-by: 2pac <tarasyarema@pm.me>	2020-04-17 13:42:48 -04:00
Philipp Emanuel Weidmann	d038d3040f	Add more sophisticated buffer benchmark system	2020-03-01 13:20:10 +05:30