Update runtime

I added more syntax highlighting for python comment code tags. Though this should be implemented for all languages...

.travis.yml

@@ -1,9 +1,11 @@
 language: go
 go:
-    - "1.11.x"
+    - "1.13.x"
 os:
     - linux
     - osx
+    - windows
 script:
-    - env GO111MODULE=on make build
-    - env GO111MODULE=on make test
+    - go build ./cmd/micro
+    - go test ./internal/...
+    - go test ./cmd/...

Makefile

@@ -6,7 +6,8 @@ HASH = $(shell git rev-parse --short HEAD)
 DATE = $(shell GOOS=$(shell go env GOHOSTOS) GOARCH=$(shell go env GOHOSTARCH) \
 	go run tools/build-date.go)
 ADDITIONAL_GO_LINKER_FLAGS = $(shell GOOS=$(shell go env GOHOSTOS) \
-	GOARCH=$(shell go env GOHOSTARCH))
+	GOARCH=$(shell go env GOHOSTARCH) \
+	go run tools/info-plist.go "$(VERSION)")
 GOBIN ?= $(shell go env GOPATH)/bin
 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
@@ -14,20 +15,20 @@ VSCODE_TESTS_BASE_URL = 'https://raw.githubusercontent.com/microsoft/vscode/e6a4
 
 # Builds micro after checking dependencies but without updating the runtime
 build:
-	go build -ldflags "-s -w $(GOVARS) $(ADDITIONAL_GO_LINKER_FLAGS)" ./cmd/micro
+	go build -trimpath -ldflags "-s -w $(GOVARS) $(ADDITIONAL_GO_LINKER_FLAGS)" ./cmd/micro
 
 build-dbg:
-	go build -ldflags "-s -w $(ADDITIONAL_GO_LINKER_FLAGS) $(DEBUGVAR)" ./cmd/micro
+	go build -trimpath -ldflags "-s -w $(ADDITIONAL_GO_LINKER_FLAGS) $(DEBUGVAR)" ./cmd/micro
 
 build-tags: fetch-tags
-	go build -ldflags "-s -w $(GOVARS) $(ADDITIONAL_GO_LINKER_FLAGS)" ./cmd/micro
+	go build -trimpath -ldflags "-s -w $(GOVARS) $(ADDITIONAL_GO_LINKER_FLAGS)" ./cmd/micro
 
 # Builds micro after building the runtime and checking dependencies
 build-all: runtime build
 
 # Builds micro without checking for dependencies
 build-quick:
-	go build -ldflags "-s -w $(GOVARS) $(ADDITIONAL_GO_LINKER_FLAGS)" ./cmd/micro
+	go build -trimpath -ldflags "-s -w $(GOVARS) $(ADDITIONAL_GO_LINKER_FLAGS)" ./cmd/micro
 
 # Same as 'build' but installs to $GOBIN afterward
 install:
@@ -46,6 +47,7 @@ fetch-tags:
 # Builds the runtime
 runtime:
 	git submodule update --init
+	rm -f runtime/syntax/*.hdr
 	go run runtime/syntax/make_headers.go runtime/syntax
 	go build -o tools/bindata ./tools/go-bindata
 	tools/bindata -pkg config -nomemcopy -nometadata -o runtime.go runtime/...
@@ -63,6 +65,7 @@ testgen:
 
 test:
 	go test ./internal/...
+	go test ./cmd/...
 
 bench:
 	for i in 1 2 3; do \
@@ -79,7 +82,7 @@ bench-compare:
 	for i in 1 2 3; do \
 		go test -bench=. ./internal/...; \
 	done > benchmark_results
-	benchstat benchmark_results_baseline benchmark_results
+	benchstat -alpha 0.15 benchmark_results_baseline benchmark_results
 
 clean:
 	rm -f micro

README.md

@@ -32,7 +32,7 @@ You can also check out the website for Micro at https://micro-editor.github.io.
   - [macOS terminal](#macos-terminal)
   - [Linux clipboard support](#linux-clipboard-support)
   - [Colors and syntax highlighting](#colors-and-syntax-highlighting)
-  - [Plan9, Cygwin, Mingw](#plan9-cygwin-mingw)
+  - [Cygwin, Mingw, Plan9](#cygwin-mingw-plan9)
 - [Usage](#usage)
 - [Documentation and Help](#documentation-and-help)
 - [Contributing](#contributing)
@@ -44,7 +44,7 @@ You can also check out the website for Micro at https://micro-editor.github.io.
 - Easy to use and install.
 - No dependencies or external files are needed — just the binary you can download further down the page.
 - Multiple cursors.
-- Common keybindings (<kbd>Ctrl+S</kbd>, <kbd>Ctrl+C</kbd>, <kbd>Ctrl+V</kbd>, <kbd>Ctrl+Z</kbd>, …).
+- Common keybindings (<kbd>Ctrl-s</kbd>, <kbd>Ctrl-c</kbd>, <kbd>Ctrl-v</kbd>, <kbd>Ctrl-z</kbd>, …).
   - Keybindings can be rebound to your liking.
 - Sane defaults.
   - You shouldn't have to configure much out of the box (and it is extremely easy to configure).
@@ -53,13 +53,13 @@ You can also check out the website for Micro at https://micro-editor.github.io.
 - Extremely good mouse support.
   - This means mouse dragging to create a selection, double click to select by word, and triple click to select by line.
 - Cross-platform (it should work on all the platforms Go runs on).
-  - Note that while Windows is supported Mingw/Cygwin is not (see below)
+  - Note that while Windows is supported Mingw/Cygwin is not (see below).
 - Plugin system (plugins are written in Lua).
   - micro has a built-in plugin manager to automatically install, remove, and update plugins.
-- Built-in diff gutter
-- Simple autocompletion
+- Built-in diff gutter.
+- Simple autocompletion.
 - Persistent undo.
-- Automatic linting and error notifications
+- Automatic linting and error notifications.
 - Syntax highlighting for over [130 languages](runtime/syntax).
 - Color scheme support.
   - By default, micro comes with 16, 256, and true color themes.
@@ -76,17 +76,17 @@ To install micro, you can download a [prebuilt binary](https://github.com/zyedid
 
 If you want more information about ways to install micro, see this [wiki page](https://github.com/zyedidia/micro/wiki/Installing-Micro).
 
+Use `micro -version` to get the version information after installing. It is only guaranteed that you are installing the most recent
+stable version if you install from the prebuilt binaries, Homebrew, or Snap.
+
+A desktop entry file and man page can be found in the [assets/packaging](https://github.com/zyedidia/micro/tree/master/assets/packaging) directory.
+
 ### Prebuilt binaries
 
 All you need to install micro is one file, the binary itself. It's as simple as that!
 
 Download the binary from the [releases](https://github.com/zyedidia/micro/releases) page.
 
-On that page you'll see the nightly release, which contains binaries for micro which are built every night,
-and you'll see all the stable releases with the corresponding binaries.
-
-Running `micro -version` will give you the version information.
-
 ### Installation script
 
 There is a script which can install micro for you by downloading the latest prebuilt binary. You can find it at <https://getmic.ro>.
@@ -97,7 +97,9 @@ You can easily install micro by running
 curl https://getmic.ro | bash
 ```
 
-The script will install the micro binary to the current directory. See its [GitHub repository](https://github.com/benweissmann/getmic.ro) for more information.
+The script will place the micro binary in the current directory. From there, you can move it to a directory on your path of your choosing (e.g. `sudo mv micro /usr/bin`). See its [GitHub repository](https://github.com/benweissmann/getmic.ro) for more information.
+
+To uninstall micro, simply remove the binary, and the configuration directory at `~/.config/micro`.
 
 ### Package managers
 
@@ -117,27 +119,26 @@ On Linux, you can install micro through [snap](https://snapcraft.io/docs/core/in
 snap install micro --classic
 ```
 
-On Debian `unstable | testing | buster-backports` and Ubuntu `focal` (20.04), micro is available
-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:
+Micro is also available through other package managers on Linux such as apt, dnf, AUR, Nix, and package managers
+for other operating systems. These packages are not guaranteed to be up-to-date.
 
-* Windows: [Chocolatey](https://chocolatey.org) and [Scoop](https://github.com/lukesampson/scoop)
-    * `choco install micro`
-    * `scoop install micro`
-* OpenBSD: Available in the ports tree and also available as a binary package
-    * `pkd_add -v micro`
-* Arch Linux, CRUX, Termux for Android
-    * See details in the [wiki page](https://github.com/zyedidia/micro/wiki/Installing-Micro)
+* Linux: Available in distro-specific package managers.
+    * `apt install micro` (Ubuntu 20.04 `focal`, and Debian `unstable | testing | buster-backports`). At the moment, this package (2.0.1-1) is outdated and has a known bug where debug mode is enabled.
+    * `dnf install micro` (Fedora).
+    * `yay -S micro` (Arch Linux).
+    * `eopkg install micro` (Solus).
+    * See [wiki](https://github.com/zyedidia/micro/wiki/Installing-Micro) for details about CRUX, Termux.
+* Windows: [Chocolatey](https://chocolatey.org) and [Scoop](https://github.com/lukesampson/scoop).
+    * `choco install micro`.
+    * `scoop install micro`.
+* OpenBSD: Available in the ports tree and also available as a binary package.
+    * `pkd_add -v micro`.
+* NetBSD, macOS, Linux, Illumos, etc. with [pkgsrc](http://www.pkgsrc.org/)-current:
+    * `pkg_add micro`
 
 ### Building from source
 
@@ -173,7 +174,7 @@ CGO_ENABLED=0 make build
 
 ### macOS terminal
 
-If you are using macOS, you should consider using [iTerm2](http://iterm2.com/) instead of the default terminal (Terminal.app). The iTerm2 terminal has much better mouse support as well as better handling of key events. For best keybinding behavior, choose `xterm defaults` under `Preferences->Profiles->Keys->Load Preset`. The newest versions also support true color.
+If you are using macOS, you should consider using [iTerm2](http://iterm2.com/) instead of the default terminal (Terminal.app). The iTerm2 terminal has much better mouse support as well as better handling of key events. For best keybinding behavior, choose `xterm defaults` under `Preferences->Profiles->Keys->Presets...`, and select `Esc+` for `Left Option Key` in the same menu. The newest versions also support true color.
 
 If you still insist on using the default Mac terminal, be sure to set `Use Option key as Meta key` under
 `Preferences->Profiles->Keyboard` to use <kbd>option</kbd> as <kbd>alt</kbd>.
@@ -191,7 +192,7 @@ If you don't have these commands, micro will use an internal clipboard for copy
 
 If you open micro and it doesn't seem like syntax highlighting is working, this is probably because
 you are using a terminal which does not support 256 color mode. Try changing the color scheme to `simple`
-by pressing <kbd>Ctrl+E</kbd> in micro and typing `set colorscheme simple`.
+by pressing <kbd>Ctrl-e</kbd> in micro and typing `set colorscheme simple`.
 
 If you are using the default Ubuntu terminal, to enable 256 make sure your `TERM` variable is set
 to `xterm-256color`.
@@ -232,7 +233,7 @@ click to enable line selection.
 
 ## Documentation and Help
 
-micro has a built-in help system which you can access by pressing <kbd>Ctrl+E</kbd> and typing `help`. Additionally, you can
+micro has a built-in help system which you can access by pressing <kbd>Ctrl-e</kbd> and typing `help`. Additionally, you can
 view the help files here:
 
 - [main help](https://github.com/zyedidia/micro/tree/master/runtime/help/help.md)
@@ -253,3 +254,5 @@ You can use the [GitHub issue tracker](https://github.com/zyedidia/micro/issues)
 to report bugs, ask questions, or suggest new features.
 
 For a more informal setting to discuss the editor, you can join the [Gitter chat](https://gitter.im/zyedidia/micro).
+
+Sometimes I am unresponsive, and I apologize! If that happens, please ping me.

assets/micro-logo-mark.svg

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 103.2 103.2"
+   enable-background="new 0 0 960 560"
+   xml:space="preserve"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="micro-logo-notext.svg"
+   width="103.2"
+   height="103.2"><metadata
+     id="metadata9"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="733"
+     inkscape:window-height="480"
+     id="namedview5"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="0.28541667"
+     inkscape:cx="302"
+     inkscape:cy="-4"
+     inkscape:window-x="1699"
+     inkscape:window-y="277"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Layer_1" /><path
+     d="M 51.6,0 C 23.1,0 0,23.1 0,51.6 c 0,28.5 23.1,51.6 51.6,51.6 28.5,0 51.6,-23.1 51.6,-51.6 C 103.2,23.1 80.1,0 51.6,0 Z m 24.5,58.6 c -0.5,2 -1.3,3.6 -2.4,4.9 -1,1.3 -2,2.1 -3.1,2.5 -1.1,0.4 -2.2,0.6 -3.4,0.6 -1.2,0 -2.2,-0.2 -3,-0.7 C 63.4,65.5 62.8,64.8 62.3,64 61.8,63.2 61.5,62.2 61.3,61.1 61.1,60 61,58.8 61,57.5 c 0,-0.5 0,-1 0.1,-1.7 0.1,-0.7 0.2,-1.6 0.3,-1.6 l -0.2,0 c -1.6,4 -3.8,6.9 -6.6,9.2 -2.8,2.3 -5.9,3.4 -9.3,3.4 -2.3,0 -4.2,-0.9 -5.5,-2.6 -1.4,-1.7 -2.1,-4.3 -2.1,-7.7 0,-0.5 0,-1 0.1,-1.6 0.1,-0.5 0.1,-0.7 0.2,-1.7 l -0.7,0 c -0.9,2 -1.7,4.8 -2.3,7.3 -0.6,2.5 -1.1,4.8 -1.4,6.9 -0.4,2.1 -0.6,4 -0.8,5.6 -0.2,1.6 -0.3,2.7 -0.4,3.3 0.1,0.5 0.2,1 0.3,1.6 0.2,0.6 0.3,1.2 0.5,1.7 0.2,0.5 0.3,1.1 0.4,1.6 0.1,0.5 0.2,0.9 0.2,1.2 0,1.4 -0.3,2.5 -0.9,3.2 -0.6,0.7 -1.3,1.1 -2,1.1 -0.9,0 -1.7,-0.3 -2.3,-0.8 -0.7,-0.6 -1,-1.5 -1,-2.7 0,-1.7 0.3,-3.9 0.9,-6.5 0.6,-2.6 1.5,-5.9 2.6,-9.8 0.6,-1.8 1.1,-3.6 1.7,-5.4 0.6,-1.8 1.1,-3.5 1.6,-5 0.5,-1.5 0.9,-2.9 1.3,-4.1 0.4,-1.2 0.6,-2.1 0.7,-2.8 0.1,-0.3 0.2,-1 0.3,-2 0.1,-1 0.2,-2.1 0.4,-3.4 0.2,-1.3 0.3,-2.7 0.5,-4.1 0.2,-1.5 0.4,-2.8 0.5,-4 0.2,-0.9 0.3,-1.9 0.5,-3 0.2,-1.1 0.5,-2.2 0.9,-3.1 0.4,-1 1,-1.8 1.7,-2.5 0.7,-0.7 1.6,-1 2.7,-1 1.2,0 2,0.4 2.4,1.1 0.4,0.7 0.6,1.6 0.5,2.6 -0.1,1 -0.2,2.1 -0.5,3.2 -0.3,1.1 -0.6,2.1 -0.9,2.9 -0.8,2.5 -1.6,4.8 -2.5,6.7 -0.9,1.9 -1.7,4 -2.4,6.2 -0.6,1.5 -0.8,2.9 -0.8,4.1 0,2.2 0.7,3.8 2,5 1.4,1.2 3,1.7 4.9,1.7 1.5,0 3,-0.5 4.4,-1.6 1.4,-1.1 2.7,-2.4 3.9,-3.9 1.2,-1.5 2.2,-3.1 3,-4.9 0.8,-1.7 1.4,-3.3 1.8,-4.6 0.1,-0.2 0.2,-0.6 0.3,-1.4 0.2,-0.8 0.3,-1.7 0.5,-2.7 0.2,-1 0.4,-2 0.6,-3.1 0.2,-1.1 0.4,-2 0.5,-2.7 0.2,-0.8 0.3,-1.6 0.5,-2.6 0.2,-1 0.5,-1.9 0.9,-2.8 0.4,-0.9 1,-1.6 1.6,-2.2 0.7,-0.6 1.5,-0.9 2.6,-0.9 1.3,0 2.1,0.4 2.6,1.1 0.4,0.7 0.6,1.6 0.6,2.6 -0.1,1 -0.2,2 -0.5,3 -0.3,1 -0.5,1.8 -0.7,2.4 -0.8,2.5 -1.6,4.7 -2.4,6.7 -0.8,2 -1.5,3.8 -2.2,5.2 -0.6,1.5 -1.1,2.6 -1.5,3.5 -0.4,0.9 -0.6,1.5 -0.6,1.8 0,2.6 0.6,4.5 1.7,5.6 1.1,1.1 2.3,1.7 3.6,1.7 2.2,0 3.9,-0.7 5.2,-2 1.3,-1.4 2.3,-3.9 2.9,-6.9 l 0.8,0 c 0.2,2.9 -0.1,5.3 -0.6,7.3 z"
+     id="path3"
+     inkscape:connector-curvature="0"
+     style="fill:#2e3192" /></svg>

assets/packaging/micro.1

@@ -14,6 +14,8 @@ of modern terminals. It comes as one single, batteries-included, static binary w
 As the name indicates, micro aims to be somewhat of a successor to the nano editor by being easy to install and use in a pinch, but micro also aims to be
 enjoyable to use full time, whether you work in the terminal because you prefer it (like me), or because you need to (over ssh).
 
+Use Ctrl-q to quit, Ctrl-s to save, and Ctrl-g to open the in-editor help menu.
+
 .SH OPTIONS
 .PP
 \-clean
@@ -51,7 +53,7 @@ Enable debug mode (enables logging to ./log.txt)
 Show the version number and information
 .RE
 
-Micro's plugin's can be managed at the command line with the following commands.
+Micro's plugins can be managed at the command line with the following commands.
 .RS 4
 
 .PP
@@ -119,5 +121,5 @@ and to report any newly encountered bugs you may find. We strive to correct
 bugs as swiftly as possible.
 
 .SH COPYRIGHT
-Copyright \(co 2020 Zachary Yedidia, et al.
-See /usr/share/doc/micro/LICENSE and /usr/share/doc/micro/AUTHORS for more information.
+Copyright \(co 2020 Zachary Yedidia, et al. MIT license.
+See \fBhttps://github.com/zyedidia/micro\fP for details.

assets/packaging/micro.desktop

@@ -6,10 +6,10 @@ Comment=Edit text files in a terminal
 
 Icon=micro
 Type=Application
-Categories=terminal;TextEditor;
+Categories=Utility;TextEditor;Development;
 Keywords=text;editor;syntax;terminal;
 
-Exec=micro %U
+Exec=micro %F
 StartupNotify=false
 Terminal=true
 MimeType=text/plain;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;text/x-java;text/x-dsrc;text/x-pascal;text/x-perl;text/x-python;application/x-php;application/x-httpd-php3;application/x-httpd-php4;application/x-httpd-php5;application/xml;text/html;text/css;text/x-sql;text/x-diff;

cmd/micro/clean.go

@@ -41,6 +41,9 @@ func CleanConfig() {
 		return
 	}
 
+	fmt.Println("Cleaning default settings")
+	config.WriteSettings(filepath.Join(config.ConfigDir, "settings.json"))
+
 	// detect unused options
 	var unusedOptions []string
 	defaultSettings := config.DefaultAllSettings()
@@ -94,14 +97,13 @@ func CleanConfig() {
 			file, e := os.Open(fname)
 
 			if e == nil {
-				defer file.Close()
-
 				decoder := gob.NewDecoder(file)
 				err = decoder.Decode(&buffer)
 
 				if err != nil && f.Name() != "history" {
 					badFiles = append(badFiles, fname)
 				}
+				file.Close()
 			}
 		}
 
@@ -111,15 +113,21 @@ func CleanConfig() {
 			fmt.Printf("Removing badly formatted files in %s\n", filepath.Join(config.ConfigDir, "buffers"))
 
 			if shouldContinue() {
+				removed := 0
 				for _, f := range badFiles {
 					err := os.Remove(f)
 					if err != nil {
 						fmt.Println(err)
 						continue
 					}
+					removed++
 				}
 
-				fmt.Println("Removed badly formatted files")
+				if removed == 0 {
+					fmt.Println("Failed to remove files")
+				} else {
+					fmt.Printf("Removed %d badly formatted files\n", removed)
+				}
 				fmt.Print("\n\n")
 			}
 		}

cmd/micro/initlua.go

@@ -50,9 +50,11 @@ func luaImportMicro() *lua.LTable {
 	ulua.L.SetField(pkg, "CurPane", luar.New(ulua.L, func() action.Pane {
 		return action.MainTab().CurPane()
 	}))
-	ulua.L.SetField(pkg, "CurTab", luar.New(ulua.L, func() *action.Tab {
-		return action.MainTab()
+	ulua.L.SetField(pkg, "CurTab", luar.New(ulua.L, action.MainTab))
+	ulua.L.SetField(pkg, "Tabs", luar.New(ulua.L, func() *action.TabList {
+		return action.Tabs
 	}))
+	ulua.L.SetField(pkg, "Lock", luar.New(ulua.L, ulua.Lock))
 
 	return pkg
 }
@@ -83,6 +85,7 @@ func luaImportMicroConfig() *lua.LTable {
 	ulua.L.SetField(pkg, "GetGlobalOption", luar.New(ulua.L, config.GetGlobalOption))
 	ulua.L.SetField(pkg, "SetGlobalOption", luar.New(ulua.L, action.SetGlobalOption))
 	ulua.L.SetField(pkg, "SetGlobalOptionNative", luar.New(ulua.L, action.SetGlobalOptionNative))
+	ulua.L.SetField(pkg, "ConfigDir", luar.New(ulua.L, config.ConfigDir))
 
 	return pkg
 }
@@ -141,6 +144,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)
 	}))

cmd/micro/micro.go

@@ -5,9 +5,12 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
+	"os/signal"
 	"regexp"
 	"runtime"
 	"sort"
+	"strconv"
+	"syscall"
 	"time"
 
 	"github.com/go-errors/errors"
@@ -15,16 +18,17 @@ import (
 	lua "github.com/yuin/gopher-lua"
 	"github.com/zyedidia/micro/v2/internal/action"
 	"github.com/zyedidia/micro/v2/internal/buffer"
+	"github.com/zyedidia/micro/v2/internal/clipboard"
 	"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/shell"
 	"github.com/zyedidia/micro/v2/internal/util"
-	"github.com/zyedidia/tcell"
+	"github.com/zyedidia/tcell/v2"
 )
 
 var (
 	// Event channel
-	events   chan tcell.Event
 	autosave chan bool
 
 	// Command line flags
@@ -44,7 +48,7 @@ func InitFlags() {
 		fmt.Println("    \tCleans the configuration directory")
 		fmt.Println("-config-dir dir")
 		fmt.Println("    \tSpecify a custom location for the configuration directory")
-		fmt.Println("[FILE]:LINE:COL")
+		fmt.Println("[FILE]:LINE:COL (if the `parsecursor` option is enabled)")
 		fmt.Println("+LINE:COL")
 		fmt.Println("    \tSpecify a line and column to start the cursor at when opening a buffer")
 		fmt.Println("-options")
@@ -131,7 +135,7 @@ func DoPluginFlags() {
 
 // LoadInput determines which files should be loaded into buffers
 // based on the input stored in flag.Args()
-func LoadInput() []*buffer.Buffer {
+func LoadInput(args []string) []*buffer.Buffer {
 	// There are a number of ways micro should start given its input
 
 	// 1. If it is given a files in flag.Args(), it should open those
@@ -146,7 +150,6 @@ func LoadInput() []*buffer.Buffer {
 	var filename string
 	var input []byte
 	var err error
-	args := flag.Args()
 	buffers := make([]*buffer.Buffer, 0, len(args))
 
 	btype := buffer.BTDefault
@@ -155,18 +158,31 @@ func LoadInput() []*buffer.Buffer {
 	}
 
 	files := make([]string, 0, len(args))
-	flagStartPos := ""
-	flagr := regexp.MustCompile(`^\+\d+(:\d+)?$`)
+	flagStartPos := buffer.Loc{-1, -1}
+	flagr := regexp.MustCompile(`^\+(\d+)(?::(\d+))?$`)
 	for _, a := range args {
-		if flagr.MatchString(a) {
-			flagStartPos = a[1:]
-		} else {
-			if flagStartPos != "" {
-				files = append(files, a+":"+flagStartPos)
-				flagStartPos = ""
-			} else {
-				files = append(files, a)
+		match := flagr.FindStringSubmatch(a)
+		if len(match) == 3 && match[2] != "" {
+			line, err := strconv.Atoi(match[1])
+			if err != nil {
+				screen.TermMessage(err)
+				continue
 			}
+			col, err := strconv.Atoi(match[2])
+			if err != nil {
+				screen.TermMessage(err)
+				continue
+			}
+			flagStartPos = buffer.Loc{col - 1, line - 1}
+		} else if len(match) == 3 && match[2] == "" {
+			line, err := strconv.Atoi(match[1])
+			if err != nil {
+				screen.TermMessage(err)
+				continue
+			}
+			flagStartPos = buffer.Loc{0, line - 1}
+		} else {
+			files = append(files, a)
 		}
 	}
 
@@ -174,7 +190,7 @@ func LoadInput() []*buffer.Buffer {
 		// Option 1
 		// We go through each file and load it
 		for i := 0; i < len(files); i++ {
-			buf, err := buffer.NewBufferFromFile(files[i], btype)
+			buf, err := buffer.NewBufferFromFileAtLoc(files[i], btype, flagStartPos)
 			if err != nil {
 				screen.TermMessage(err)
 				continue
@@ -191,10 +207,10 @@ func LoadInput() []*buffer.Buffer {
 			screen.TermMessage("Error reading from stdin: ", err)
 			input = []byte{}
 		}
-		buffers = append(buffers, buffer.NewBufferFromString(string(input), filename, btype))
+		buffers = append(buffers, buffer.NewBufferFromStringAtLoc(string(input), filename, btype, flagStartPos))
 	} else {
 		// Option 3, just open an empty buffer
-		buffers = append(buffers, buffer.NewBufferFromString(string(input), filename, btype))
+		buffers = append(buffers, buffer.NewBufferFromStringAtLoc(string(input), filename, btype, flagStartPos))
 	}
 
 	return buffers
@@ -229,7 +245,10 @@ func main() {
 	if err != nil {
 		screen.TermMessage(err)
 	}
-	config.InitGlobalSettings()
+	err = config.InitGlobalSettings()
+	if err != nil {
+		screen.TermMessage(err)
+	}
 
 	// flag options
 	for k, v := range optionFlags {
@@ -245,18 +264,48 @@ func main() {
 
 	DoPluginFlags()
 
-	screen.Init()
+	err = screen.Init()
+	if err != nil {
+		fmt.Println(err)
+		fmt.Println("Fatal: Micro could not initialize a Screen.")
+		os.Exit(1)
+	}
+
+	c := make(chan os.Signal, 1)
+	signal.Notify(c, syscall.SIGTERM)
+
+	go func() {
+		<-c
+
+		for _, b := range buffer.OpenBuffers {
+			if !b.Modified() {
+				b.Fini()
+			}
+		}
+
+		if screen.Screen != nil {
+			screen.Screen.Fini()
+		}
+		os.Exit(0)
+	}()
+
+	m := clipboard.SetMethod(config.GetGlobalOption("clipboard").(string))
+	clipErr := clipboard.Initialize(m)
 
 	defer func() {
 		if err := recover(); err != nil {
-			screen.Screen.Fini()
-			fmt.Println("Micro encountered an error:", err)
+			if screen.Screen != nil {
+				screen.Screen.Fini()
+			}
+			if e, ok := err.(*lua.ApiError); ok {
+				fmt.Println("Lua API error:", e)
+			} else {
+				fmt.Println("Micro encountered an error:", errors.Wrap(err, 2).ErrorStack(), "\nIf you can reproduce this error, please report it at https://github.com/zyedidia/micro/issues")
+			}
 			// backup all open buffers
 			for _, b := range buffer.OpenBuffers {
-				b.Backup(false)
+				b.Backup()
 			}
-			// Print the stack trace too
-			fmt.Print(errors.Wrap(err, 2).ErrorStack())
 			os.Exit(1)
 		}
 	}()
@@ -274,7 +323,13 @@ func main() {
 		screen.TermMessage(err)
 	}
 
-	b := LoadInput()
+	err = config.RunPluginFn("preinit")
+	if err != nil {
+		screen.TermMessage(err)
+	}
+
+	args := flag.Args()
+	b := LoadInput(args)
 
 	if len(b) == 0 {
 		// No buffers to open
@@ -290,7 +345,16 @@ func main() {
 		screen.TermMessage(err)
 	}
 
-	events = make(chan tcell.Event)
+	err = config.RunPluginFn("postinit")
+	if err != nil {
+		screen.TermMessage(err)
+	}
+
+	if clipErr != nil {
+		action.InfoBar.Error(clipErr, " or change 'clipboard' option")
+	}
+
+	screen.Events = make(chan tcell.Event)
 
 	// Here is the event loop which runs in a separate thread
 	go func() {
@@ -299,7 +363,7 @@ func main() {
 			e := screen.Screen.PollEvent()
 			screen.Unlock()
 			if e != nil {
-				events <- e
+				screen.Events <- e
 			}
 		}
 	}()
@@ -312,15 +376,12 @@ func main() {
 
 	// wait for initial resize event
 	select {
-	case event := <-events:
+	case event := <-screen.Events:
 		action.Tabs.HandleEvent(event)
 	case <-time.After(10 * time.Millisecond):
 		// time out after 10ms
 	}
 
-	// Since this loop is very slow (waits for user input every time) it's
-	// okay to be inefficient and run it via a function every time
-	// We do this so we can recover from panics without crashing the editor
 	for {
 		DoEvent()
 	}
@@ -330,16 +391,6 @@ func main() {
 func DoEvent() {
 	var event tcell.Event
 
-	// recover from errors without crashing the editor
-	defer func() {
-		if err := recover(); err != nil {
-			if e, ok := err.(*lua.ApiError); ok {
-				screen.TermMessage("Lua API error:", e)
-			} else {
-				screen.TermMessage("Micro encountered an error:", errors.Wrap(err, 2).ErrorStack(), "\nIf you can reproduce this error, please report it at https://github.com/zyedidia/micro/issues")
-			}
-		}
-	}()
 	// Display everything
 	screen.Screen.Fill(' ', config.DefStyle)
 	screen.Screen.HideCursor()
@@ -355,19 +406,30 @@ func DoEvent() {
 	select {
 	case f := <-shell.Jobs:
 		// If a new job has finished while running in the background we should execute the callback
+		ulua.Lock.Lock()
 		f.Function(f.Output, f.Args)
+		ulua.Lock.Unlock()
 	case <-config.Autosave:
+		ulua.Lock.Lock()
 		for _, b := range buffer.OpenBuffers {
 			b.Save()
 		}
+		ulua.Lock.Unlock()
 	case <-shell.CloseTerms:
-	case event = <-events:
+	case event = <-screen.Events:
 	case <-screen.DrawChan():
+		for len(screen.DrawChan()) > 0 {
+			<-screen.DrawChan()
+		}
 	}
 
+	ulua.Lock.Lock()
+	// if event != nil {
 	if action.InfoBar.HasPrompt {
 		action.InfoBar.HandleEvent(event)
 	} else {
 		action.Tabs.HandleEvent(event)
 	}
+	// }
+	ulua.Lock.Unlock()
 }

cmd/micro/micro_test.go

@@ -0,0 +1,341 @@
+package main
+
+import (
+	"fmt"
+	"io/ioutil"
+	"log"
+	"os"
+	"testing"
+
+	"github.com/go-errors/errors"
+	"github.com/stretchr/testify/assert"
+	"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/tcell/v2"
+)
+
+var tempDir string
+var sim tcell.SimulationScreen
+
+func init() {
+	screen.Events = make(chan tcell.Event, 8)
+}
+
+func startup(args []string) (tcell.SimulationScreen, error) {
+	var err error
+
+	tempDir, err = ioutil.TempDir("", "micro_test")
+	if err != nil {
+		return nil, err
+	}
+	err = config.InitConfigDir(tempDir)
+	if err != nil {
+		return nil, err
+	}
+
+	config.InitRuntimeFiles()
+	err = config.ReadSettings()
+	if err != nil {
+		return nil, err
+	}
+	err = config.InitGlobalSettings()
+	if err != nil {
+		return nil, err
+	}
+
+	s, err := screen.InitSimScreen()
+	if err != nil {
+		return nil, err
+	}
+
+	defer func() {
+		if err := recover(); err != nil {
+			screen.Screen.Fini()
+			fmt.Println("Micro encountered an error:", err)
+			// backup all open buffers
+			for _, b := range buffer.OpenBuffers {
+				b.Backup()
+			}
+			// Print the stack trace too
+			log.Fatalf(errors.Wrap(err, 2).ErrorStack())
+			os.Exit(1)
+		}
+	}()
+
+	err = config.LoadAllPlugins()
+	if err != nil {
+		screen.TermMessage(err)
+	}
+
+	action.InitBindings()
+	action.InitCommands()
+
+	err = config.InitColorscheme()
+	if err != nil {
+		return nil, err
+	}
+
+	b := LoadInput(args)
+
+	if len(b) == 0 {
+		return nil, errors.New("No buffers opened")
+	}
+
+	action.InitTabs(b)
+	action.InitGlobals()
+
+	err = config.RunPluginFn("init")
+	if err != nil {
+		return nil, err
+	}
+
+	s.InjectResize()
+	handleEvent()
+
+	return s, nil
+}
+
+func cleanup() {
+	os.RemoveAll(tempDir)
+}
+
+func handleEvent() {
+	screen.Lock()
+	e := screen.Screen.PollEvent()
+	screen.Unlock()
+	if e != nil {
+		screen.Events <- e
+	}
+	DoEvent()
+}
+
+func injectKey(key tcell.Key, r rune, mod tcell.ModMask) {
+	sim.InjectKey(key, r, mod)
+	handleEvent()
+}
+
+func injectMouse(x, y int, buttons tcell.ButtonMask, mod tcell.ModMask) {
+	sim.InjectMouse(x, y, buttons, mod)
+	handleEvent()
+}
+
+func injectString(str string) {
+	// the tcell simulation screen event channel can only handle
+	// 10 events at once, so we need to divide up the key events
+	// into chunks of 10 and handle the 10 events before sending
+	// another chunk of events
+	iters := len(str) / 10
+	extra := len(str) % 10
+
+	for i := 0; i < iters; i++ {
+		s := i * 10
+		e := i*10 + 10
+		sim.InjectKeyBytes([]byte(str[s:e]))
+		for i := 0; i < 10; i++ {
+			handleEvent()
+		}
+	}
+
+	sim.InjectKeyBytes([]byte(str[len(str)-extra:]))
+	for i := 0; i < extra; i++ {
+		handleEvent()
+	}
+}
+
+func openFile(file string) {
+	injectKey(tcell.KeyCtrlE, rune(tcell.KeyCtrlE), tcell.ModCtrl)
+	injectString(fmt.Sprintf("open %s", file))
+	injectKey(tcell.KeyEnter, rune(tcell.KeyEnter), tcell.ModNone)
+}
+
+func createTestFile(name string, content string) (string, error) {
+	testf, err := ioutil.TempFile("", name)
+	if err != nil {
+		return "", err
+	}
+
+	if _, err := testf.Write([]byte(content)); err != nil {
+		return "", err
+	}
+	if err := testf.Close(); err != nil {
+		return "", err
+	}
+
+	return testf.Name(), nil
+}
+
+func TestMain(m *testing.M) {
+	var err error
+	sim, err = startup([]string{})
+	if err != nil {
+		log.Fatalln(err)
+		os.Exit(1)
+	}
+
+	retval := m.Run()
+	cleanup()
+
+	os.Exit(retval)
+}
+
+func TestSimpleEdit(t *testing.T) {
+	file, err := createTestFile("micro_simple_edit_test", "base content")
+	if err != nil {
+		t.Error(err)
+		return
+	}
+	defer os.Remove(file)
+
+	openFile(file)
+
+	var buf *buffer.Buffer
+	for _, b := range buffer.OpenBuffers {
+		if b.Path == file {
+			buf = b
+		}
+	}
+
+	if buf == nil {
+		t.Errorf("Could not find buffer %s", file)
+		return
+	}
+
+	injectKey(tcell.KeyEnter, rune(tcell.KeyEnter), tcell.ModNone)
+	injectKey(tcell.KeyUp, 0, tcell.ModNone)
+	injectString("first line")
+
+	// test both kinds of backspace
+	for i := 0; i < len("ne"); i++ {
+		injectKey(tcell.KeyBackspace, rune(tcell.KeyBackspace), tcell.ModNone)
+	}
+	for i := 0; i < len(" li"); i++ {
+		injectKey(tcell.KeyBackspace2, rune(tcell.KeyBackspace2), tcell.ModNone)
+	}
+	injectString("foobar")
+
+	injectKey(tcell.KeyCtrlS, rune(tcell.KeyCtrlS), tcell.ModCtrl)
+
+	data, err := ioutil.ReadFile(file)
+	if err != nil {
+		t.Error(err)
+		return
+	}
+
+	assert.Equal(t, "firstfoobar\nbase content\n", string(data))
+}
+
+func TestMouse(t *testing.T) {
+	file, err := createTestFile("micro_mouse_test", "base content")
+	if err != nil {
+		t.Error(err)
+		return
+	}
+	defer os.Remove(file)
+
+	openFile(file)
+
+	// buffer:
+	// base content
+	// the selections need to happen at different locations to avoid a double click
+	injectMouse(3, 0, tcell.Button1, tcell.ModNone)
+	injectKey(tcell.KeyLeft, 0, tcell.ModNone)
+	injectMouse(0, 0, tcell.ButtonNone, tcell.ModNone)
+	injectString("secondline")
+	// buffer:
+	// secondlinebase content
+	injectKey(tcell.KeyEnter, rune(tcell.KeyEnter), tcell.ModNone)
+	// buffer:
+	// secondline
+	// base content
+	injectMouse(2, 0, tcell.Button1, tcell.ModNone)
+	injectMouse(0, 0, tcell.ButtonNone, tcell.ModNone)
+	injectKey(tcell.KeyEnter, rune(tcell.KeyEnter), tcell.ModNone)
+	// buffer:
+	//
+	// secondline
+	// base content
+	injectKey(tcell.KeyUp, 0, tcell.ModNone)
+	injectString("firstline")
+	// buffer:
+	// firstline
+	// secondline
+	// base content
+	injectKey(tcell.KeyCtrlS, rune(tcell.KeyCtrlS), tcell.ModCtrl)
+
+	data, err := ioutil.ReadFile(file)
+	if err != nil {
+		t.Error(err)
+		return
+	}
+
+	assert.Equal(t, "firstline\nsecondline\nbase content\n", string(data))
+}
+
+var srTestStart = `foo
+foo
+foofoofoo
+Ernleȝe foo æðelen
+`
+var srTest2 = `test_string
+test_string
+test_stringtest_stringtest_string
+Ernleȝe test_string æðelen
+`
+var srTest3 = `test_foo
+test_string
+test_footest_stringtest_foo
+Ernleȝe test_string æðelen
+`
+
+func TestSearchAndReplace(t *testing.T) {
+	file, err := createTestFile("micro_search_replace_test", srTestStart)
+	if err != nil {
+		t.Error(err)
+		return
+	}
+	defer os.Remove(file)
+
+	openFile(file)
+
+	injectKey(tcell.KeyCtrlE, rune(tcell.KeyCtrlE), tcell.ModCtrl)
+	injectString(fmt.Sprintf("replaceall %s %s", "foo", "test_string"))
+	injectKey(tcell.KeyEnter, rune(tcell.KeyEnter), tcell.ModNone)
+
+	injectKey(tcell.KeyCtrlS, rune(tcell.KeyCtrlS), tcell.ModCtrl)
+
+	data, err := ioutil.ReadFile(file)
+	if err != nil {
+		t.Error(err)
+		return
+	}
+
+	assert.Equal(t, srTest2, string(data))
+
+	injectKey(tcell.KeyCtrlE, rune(tcell.KeyCtrlE), tcell.ModCtrl)
+	injectString(fmt.Sprintf("replace %s %s", "string", "foo"))
+	injectKey(tcell.KeyEnter, rune(tcell.KeyEnter), tcell.ModNone)
+	injectString("ynyny")
+	injectKey(tcell.KeyEscape, 0, tcell.ModNone)
+
+	injectKey(tcell.KeyCtrlS, rune(tcell.KeyCtrlS), tcell.ModCtrl)
+
+	data, err = ioutil.ReadFile(file)
+	if err != nil {
+		t.Error(err)
+		return
+	}
+
+	assert.Equal(t, srTest3, string(data))
+}
+
+func TestMultiCursor(t *testing.T) {
+	// TODO
+}
+
+func TestSettingsPersistence(t *testing.T) {
+	// TODO
+}
+
+// more tests (rendering, tabs, plugins)?

go.mod

@@ -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-20200421031010-7c45b8673834
+	github.com/zyedidia/clipboard v1.0.3
 	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.5
+	github.com/zyedidia/tcell/v2 v2.0.6
 	github.com/zyedidia/terminal v0.0.0-20180726154117-533c623e2415
 	golang.org/x/text v0.3.2
 	gopkg.in/sourcemap.v1 v1.0.5 // indirect
@@ -25,4 +25,8 @@ require (
 	layeh.com/gopher-luar v1.0.7
 )
 
+replace github.com/kballard/go-shellquote => github.com/zyedidia/go-shellquote v0.0.0-20200613203517-eccd813c0655
+
+replace github.com/mattn/go-runewidth => github.com/p-e-w/go-runewidth v0.0.10-0.20200613030200-3e1705c5c059
+
 go 1.11

go.sum

@@ -12,8 +12,6 @@ github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdk
 github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg=
 github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w=
 github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
-github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
-github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
@@ -23,10 +21,10 @@ github.com/lucasb-eyer/go-colorful v1.0.3 h1:QIbQXiugsb+q10B+MI+7DI1oQLdmnep86tW
 github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
 github.com/mattn/go-isatty v0.0.11 h1:FxPOTFNqGkuDUGi3H/qkUbQO4ZiBa2brKq5r0l8TGeM=
 github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
-github.com/mattn/go-runewidth v0.0.7 h1:Ei8KR0497xHyKJPAv59M1dkC+rOZCMBJ+t3fZ+twI54=
-github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/p-e-w/go-runewidth v0.0.10-0.20200613030200-3e1705c5c059 h1:/+h2b6i15wh4EWsFkfdNdBE1jjGA872tpXEyhPM5aYg=
+github.com/p-e-w/go-runewidth v0.0.10-0.20200613030200-3e1705c5c059/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/robertkrimen/otto v0.0.0-20191219234010-c382bd3c16ff h1:+6NUiITWwE5q1KO6SAfUX918c+Tab0+tGAM/mtdlUyA=
@@ -37,15 +35,17 @@ github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/xo/terminfo v0.0.0-20200218205459-454e5b68f9e8 h1:woqigIZtZUZxws1zZA99nAvuz2mQrxtWsuZSR9c8I/A=
+github.com/xo/terminfo v0.0.0-20200218205459-454e5b68f9e8/go.mod h1:6Yhx5ZJl5942QrNRWLwITArVT9okUXc5c3brgWJMoDc=
 github.com/yuin/gopher-lua v0.0.0-20190206043414-8bfc7677f583/go.mod h1:gqRgreBUhTSL0GeU64rtZ3Uq3wtjOa/TB2YfrtkCbVQ=
 github.com/yuin/gopher-lua v0.0.0-20191220021717-ab39c6098bdb h1:ZkM6LRnq40pR1Ox0hTHlnpkcOTuFIDQpZ1IN8rKKhX0=
 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/clipboard v1.0.3 h1:F/nCDVYMdbDWTmY8s8cJl0tnwX32q96IF09JHM14bUI=
+github.com/zyedidia/clipboard v1.0.3/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/go-shellquote v0.0.0-20200613203517-eccd813c0655 h1:Z3RhH6hvcSx7eX6Q/pP6YVsgea/1eMDG99vtWwi3nK4=
+github.com/zyedidia/go-shellquote v0.0.0-20200613203517-eccd813c0655/go.mod h1:1sTqqO+kcYzZp43M5VsJe1tns9IzlSeC9jB6c2+o/5Y=
 github.com/zyedidia/highlight v0.0.0-20170330143449-201131ce5cf5 h1:Zs6mpwXvlqpF9zHl5XaN0p5V4J9XvP+WBuiuXyIgqvc=
 github.com/zyedidia/highlight v0.0.0-20170330143449-201131ce5cf5/go.mod h1:c1r+Ob9tUTPB0FKWO1+x+Hsc/zNa45WdGq7Y38Ybip0=
 github.com/zyedidia/json5 v0.0.0-20200102012142-2da050b1a98d h1:zmDMkh22zXOB7gz8jFaI4GpI7llsPgzm38/jG0UgxjE=
@@ -54,10 +54,8 @@ github.com/zyedidia/poller v1.0.1 h1:Tt9S3AxAjXwWGNiC2TUdRJkQDZSzCBNVQ4xXiQ7440s
 github.com/zyedidia/poller v1.0.1/go.mod h1:vZXJOHGDcuK08GXhF6IAY0ZFd2WcgOR5DOTp84Uk5eE=
 github.com/zyedidia/pty v2.0.0+incompatible h1:Ou5vXL6tvjst+RV8sUFISbuKDnUJPhnpygApMFGweqw=
 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/tcell/v2 v2.0.6 h1:v0GoNpPYJ+Wbd1RiSL09SUFzoq4eVKTuT5awbW6aqGs=
+github.com/zyedidia/tcell/v2 v2.0.6/go.mod h1:i4NNlquIQXFeNecrOgxDQQJdu+7LmTi3g62asvmwUws=
 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=

internal/action/actions.go

@@ -7,13 +7,13 @@ import (
 	"time"
 
 	shellquote "github.com/kballard/go-shellquote"
-	"github.com/zyedidia/clipboard"
 	"github.com/zyedidia/micro/v2/internal/buffer"
+	"github.com/zyedidia/micro/v2/internal/clipboard"
 	"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/tcell/v2"
 )
 
 // ScrollUp is not an action
@@ -59,7 +59,7 @@ func (h *BufPane) MousePress(e *tcell.EventMouse) bool {
 				h.doubleClick = false
 
 				h.Cursor.SelectLine()
-				h.Cursor.CopySelection("primary")
+				h.Cursor.CopySelection(clipboard.PrimaryReg)
 			} else {
 				// Double click
 				h.lastClickTime = time.Now()
@@ -68,7 +68,7 @@ func (h *BufPane) MousePress(e *tcell.EventMouse) bool {
 				h.tripleClick = false
 
 				h.Cursor.SelectWord()
-				h.Cursor.CopySelection("primary")
+				h.Cursor.CopySelection(clipboard.PrimaryReg)
 			}
 		} else {
 			h.doubleClick = false
@@ -92,6 +92,7 @@ func (h *BufPane) MousePress(e *tcell.EventMouse) bool {
 
 	h.Cursor.StoreVisualX()
 	h.lastLoc = mouseLoc
+	h.Relocate()
 	return true
 }
 
@@ -663,7 +664,12 @@ func (h *BufPane) Autocomplete() bool {
 		return false
 	}
 
-	if !util.IsNonAlphaNumeric(h.Cursor.RuneUnder(h.Cursor.X)) {
+	if h.Cursor.X == 0 {
+		return false
+	}
+	r := h.Cursor.RuneUnder(h.Cursor.X)
+	prev := h.Cursor.RuneUnder(h.Cursor.X - 1)
+	if !util.IsAutocomplete(prev) || !util.IsNonAlphaNumeric(r) {
 		// don't autocomplete if cursor is on alpha numeric character (middle of a word)
 		return false
 	}
@@ -727,6 +733,7 @@ func (h *BufPane) Save() bool {
 }
 
 // SaveAsCB performs a save as and does a callback at the very end (after all prompts have been resolved)
+// The callback is only called if the save was successful
 func (h *BufPane) SaveAsCB(action string, callback func()) bool {
 	InfoBar.Prompt("Filename: ", "", "Save", nil, func(resp string, canceled bool) {
 		if !canceled {
@@ -757,6 +764,7 @@ func (h *BufPane) SaveAs() bool {
 
 // This function saves the buffer to `filename` and changes the buffer's path and name
 // to `filename` if the save is successful
+// The callback is only called if the save was successful
 func (h *BufPane) saveBufToFile(filename string, action string, callback func()) bool {
 	err := h.Buf.SaveAs(filename)
 	if err != nil {
@@ -769,6 +777,9 @@ func (h *BufPane) saveBufToFile(filename string, action string, callback func())
 					h.Buf.Path = filename
 					h.Buf.SetName(filename)
 					InfoBar.Message("Saved " + filename)
+					if callback != nil {
+						callback()
+					}
 				}
 			}
 			if h.Buf.Settings["autosu"].(bool) {
@@ -779,9 +790,6 @@ func (h *BufPane) saveBufToFile(filename string, action string, callback func())
 						saveWithSudo()
 						h.completeAction(action)
 					}
-					if callback != nil {
-						callback()
-					}
 				})
 				return false
 			}
@@ -792,9 +800,9 @@ func (h *BufPane) saveBufToFile(filename string, action string, callback func())
 		h.Buf.Path = filename
 		h.Buf.SetName(filename)
 		InfoBar.Message("Saved " + filename)
-	}
-	if callback != nil {
-		callback()
+		if callback != nil {
+			callback()
+		}
 	}
 	return true
 }
@@ -809,6 +817,30 @@ func (h *BufPane) FindLiteral() bool {
 	return h.find(false)
 }
 
+// Search searches for a given string/regex in the buffer and selects the next
+// match if a match is found
+// This function affects lastSearch and lastSearchRegex (saved searches) for
+// use with FindNext and FindPrevious
+func (h *BufPane) Search(str string, useRegex bool, searchDown bool) error {
+	match, found, err := h.Buf.FindNext(str, h.Buf.Start(), h.Buf.End(), h.Cursor.Loc, searchDown, useRegex)
+	if err != nil {
+		return err
+	}
+	if found {
+		h.Cursor.SetSelectionStart(match[0])
+		h.Cursor.SetSelectionEnd(match[1])
+		h.Cursor.OrigSelection[0] = h.Cursor.CurSelection[0]
+		h.Cursor.OrigSelection[1] = h.Cursor.CurSelection[1]
+		h.Cursor.GotoLoc(h.Cursor.CurSelection[1])
+		h.lastSearch = str
+		h.lastSearchRegex = useRegex
+		h.Relocate()
+	} else {
+		h.Cursor.ResetSelection()
+	}
+	return nil
+}
+
 func (h *BufPane) find(useRegex bool) bool {
 	h.searchOrig = h.Cursor.Loc
 	prompt := "Find: "
@@ -930,13 +962,9 @@ func (h *BufPane) Redo() bool {
 // Copy the selection to the system clipboard
 func (h *BufPane) Copy() bool {
 	if h.Cursor.HasSelection() {
-		h.Cursor.CopySelection("clipboard")
+		h.Cursor.CopySelection(clipboard.ClipboardReg)
 		h.freshClip = true
-		if clipboard.Unsupported {
-			InfoBar.Message("Copied selection (install xclip for external clipboard)")
-		} else {
-			InfoBar.Message("Copied selection")
-		}
+		InfoBar.Message("Copied selection")
 	}
 	h.Relocate()
 	return true
@@ -948,13 +976,9 @@ func (h *BufPane) CopyLine() bool {
 		return false
 	} else {
 		h.Cursor.SelectLine()
-		h.Cursor.CopySelection("clipboard")
+		h.Cursor.CopySelection(clipboard.ClipboardReg)
 		h.freshClip = true
-		if clipboard.Unsupported {
-			InfoBar.Message("Copied line (install xclip for external clipboard)")
-		} else {
-			InfoBar.Message("Copied line")
-		}
+		InfoBar.Message("Copied line")
 	}
 	h.Cursor.Deselect(true)
 	h.Relocate()
@@ -967,15 +991,15 @@ func (h *BufPane) CutLine() bool {
 	if !h.Cursor.HasSelection() {
 		return false
 	}
-	if h.freshClip == true {
+	if h.freshClip {
 		if h.Cursor.HasSelection() {
-			if clip, err := clipboard.ReadAll("clipboard"); err != nil {
-				// messenger.Error(err)
+			if clip, err := clipboard.Read(clipboard.ClipboardReg); err != nil {
+				InfoBar.Error(err)
 			} else {
-				clipboard.WriteAll(clip+string(h.Cursor.GetSelection()), "clipboard")
+				clipboard.WriteMulti(clip+string(h.Cursor.GetSelection()), clipboard.ClipboardReg, h.Cursor.Num, h.Buf.NumCursors())
 			}
 		}
-	} else if time.Since(h.lastCutTime)/time.Second > 10*time.Second || h.freshClip == false {
+	} else if time.Since(h.lastCutTime)/time.Second > 10*time.Second || !h.freshClip {
 		h.Copy()
 	}
 	h.freshClip = true
@@ -990,7 +1014,7 @@ func (h *BufPane) CutLine() bool {
 // Cut the selection to the system clipboard
 func (h *BufPane) Cut() bool {
 	if h.Cursor.HasSelection() {
-		h.Cursor.CopySelection("clipboard")
+		h.Cursor.CopySelection(clipboard.ClipboardReg)
 		h.Cursor.DeleteSelection()
 		h.Cursor.ResetSelection()
 		h.freshClip = true
@@ -1116,16 +1140,24 @@ func (h *BufPane) MoveLinesDown() bool {
 // Paste whatever is in the system clipboard into the buffer
 // Delete and paste if the user has a selection
 func (h *BufPane) Paste() bool {
-	clip, _ := clipboard.ReadAll("clipboard")
-	h.paste(clip)
+	clip, err := clipboard.ReadMulti(clipboard.ClipboardReg, h.Cursor.Num, h.Buf.NumCursors())
+	if err != nil {
+		InfoBar.Error(err)
+	} else {
+		h.paste(clip)
+	}
 	h.Relocate()
 	return true
 }
 
 // PastePrimary pastes from the primary clipboard (only use on linux)
 func (h *BufPane) PastePrimary() bool {
-	clip, _ := clipboard.ReadAll("primary")
-	h.paste(clip)
+	clip, err := clipboard.ReadMulti(clipboard.PrimaryReg, h.Cursor.Num, h.Buf.NumCursors())
+	if err != nil {
+		InfoBar.Error(err)
+	} else {
+		h.paste(clip)
+	}
 	h.Relocate()
 	return true
 }
@@ -1146,11 +1178,7 @@ func (h *BufPane) paste(clip string) {
 	h.Buf.Insert(h.Cursor.Loc, clip)
 	// h.Cursor.Loc = h.Cursor.Loc.Move(Count(clip), h.Buf)
 	h.freshClip = false
-	if clipboard.Unsupported {
-		InfoBar.Message("Pasted clipboard (install xclip for external clipboard)")
-	} else {
-		InfoBar.Message("Pasted clipboard")
-	}
+	InfoBar.Message("Pasted clipboard")
 }
 
 // JumpToMatchingBrace moves the cursor to the matching brace if it is
@@ -1412,6 +1440,18 @@ func (h *BufPane) Escape() bool {
 	return true
 }
 
+// Deselect deselects on the current cursor
+func (h *BufPane) Deselect() bool {
+	h.Cursor.Deselect(true)
+	return true
+}
+
+// ClearInfo clears the infobar
+func (h *BufPane) ClearInfo() bool {
+	InfoBar.Message("")
+	return true
+}
+
 // Quit this will close the current tab or view that is open
 func (h *BufPane) Quit() bool {
 	quit := func() {

internal/action/bindings.go

@@ -6,15 +6,22 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
+	"regexp"
 	"strings"
 	"unicode"
 
 	"github.com/zyedidia/json5"
 	"github.com/zyedidia/micro/v2/internal/config"
 	"github.com/zyedidia/micro/v2/internal/screen"
-	"github.com/zyedidia/tcell"
+	"github.com/zyedidia/tcell/v2"
 )
 
+var Binder = map[string]func(e Event, action string){
+	"command":  InfoMapEvent,
+	"buffer":   BufMapEvent,
+	"terminal": TermMapEvent,
+}
+
 func createBindingsIfNotExist(fname string) {
 	if _, e := os.Stat(fname); os.IsNotExist(e) {
 		ioutil.WriteFile(fname, []byte("{}"), 0644)
@@ -23,10 +30,7 @@ func createBindingsIfNotExist(fname string) {
 
 // InitBindings intializes the bindings map by reading from bindings.json
 func InitBindings() {
-	config.Bindings = DefaultBindings()
-
-	var parsed map[string]string
-	defaults := DefaultBindings()
+	var parsed map[string]interface{}
 
 	filename := filepath.Join(config.ConfigDir, "bindings.json")
 	createBindingsIfNotExist(filename)
@@ -44,34 +48,87 @@ func InitBindings() {
 		}
 	}
 
-	for k, v := range defaults {
-		BindKey(k, v)
+	for p, bind := range Binder {
+		defaults := DefaultBindings(p)
+
+		for k, v := range defaults {
+			BindKey(k, v, bind)
+		}
 	}
+
 	for k, v := range parsed {
-		BindKey(k, v)
+		switch val := v.(type) {
+		case string:
+			BindKey(k, val, Binder["buffer"])
+		case map[string]interface{}:
+			bind := Binder[k]
+			for e, a := range val {
+				s, ok := a.(string)
+				if !ok {
+					screen.TermMessage("Error reading bindings.json: non-string and non-map entry", k)
+				} else {
+					BindKey(e, s, bind)
+				}
+			}
+		default:
+			screen.TermMessage("Error reading bindings.json: non-string and non-map entry", k)
+		}
 	}
 }
 
-func BindKey(k, v string) {
-	event, ok := findEvent(k)
-	if !ok {
-		screen.TermMessage(k, "is not a bindable event")
+func BindKey(k, v string, bind func(e Event, a string)) {
+	event, err := findEvent(k)
+	if err != nil {
+		screen.TermMessage(err)
+		return
 	}
 
-	switch e := event.(type) {
-	case KeyEvent:
-		BufMapKey(e, v)
-	case MouseEvent:
-		BufMapMouse(e, v)
-	case RawEvent:
-		BufMapKey(e, v)
-	}
+	config.Bindings[event.Name()] = v
 
-	config.Bindings[k] = v
+	bind(event, v)
+
+	// switch e := event.(type) {
+	// case KeyEvent:
+	// 	InfoMapKey(e, v)
+	// case KeySequenceEvent:
+	// 	InfoMapKey(e, v)
+	// case MouseEvent:
+	// 	InfoMapMouse(e, v)
+	// case RawEvent:
+	// 	InfoMapKey(e, v)
+	// }
 }
 
-// findEvent will find binding Key 'b' using string 'k'
-func findEvent(k string) (b Event, ok bool) {
+var r = regexp.MustCompile("<(.+?)>")
+
+func findEvents(k string) (b KeySequenceEvent, ok bool, err error) {
+	var events []Event = nil
+	for len(k) > 0 {
+		groups := r.FindStringSubmatchIndex(k)
+
+		if len(groups) > 3 {
+			if events == nil {
+				events = make([]Event, 0, 3)
+			}
+
+			e, ok := findSingleEvent(k[groups[2]:groups[3]])
+			if !ok {
+				return KeySequenceEvent{}, false, errors.New("Invalid event " + k[groups[2]:groups[3]])
+			}
+
+			events = append(events, e)
+
+			k = k[groups[3]+1:]
+		} else {
+			return KeySequenceEvent{}, false, nil
+		}
+	}
+
+	return KeySequenceEvent{events}, true, nil
+}
+
+// findSingleEvent will find binding Key 'b' using string 'k'
+func findSingleEvent(k string) (b Event, ok bool) {
 	modifiers := tcell.ModNone
 
 	// First, we'll strip off all the modifiers in the name and add them to the
@@ -102,7 +159,7 @@ modSearch:
 		}
 	}
 
-	if len(k) == 0 {
+	if k == "" {
 		return KeyEvent{}, false
 	}
 
@@ -162,6 +219,23 @@ modSearch:
 	return KeyEvent{}, false
 }
 
+func findEvent(k string) (Event, error) {
+	var event Event
+	event, ok, err := findEvents(k)
+	if err != nil {
+		return nil, err
+	}
+
+	if !ok {
+		event, ok = findSingleEvent(k)
+		if !ok {
+			return nil, errors.New(k + " is not a bindable event")
+		}
+	}
+
+	return event, nil
+}
+
 // TryBindKey tries to bind a key by writing to config.ConfigDir/bindings.json
 // Returns true if the keybinding already existed and a possible error
 func TryBindKey(k, v string, overwrite bool) (bool, error) {
@@ -181,14 +255,14 @@ func TryBindKey(k, v string, overwrite bool) (bool, error) {
 			return false, errors.New("Error reading bindings.json: " + err.Error())
 		}
 
-		key, ok := findEvent(k)
-		if !ok {
-			return false, errors.New("Invalid event " + k)
+		key, err := findEvent(k)
+		if err != nil {
+			return false, err
 		}
 
 		found := false
 		for ev := range parsed {
-			if e, ok := findEvent(ev); ok {
+			if e, err := findEvent(ev); err == nil {
 				if e == key {
 					if overwrite {
 						parsed[ev] = v
@@ -205,7 +279,7 @@ func TryBindKey(k, v string, overwrite bool) (bool, error) {
 			parsed[k] = v
 		}
 
-		BindKey(k, v)
+		BindKey(k, v, Binder["buffer"])
 
 		txt, _ := json.MarshalIndent(parsed, "", "    ")
 		return true, ioutil.WriteFile(filename, append(txt, '\n'), 0644)
@@ -231,13 +305,13 @@ func UnbindKey(k string) error {
 			return errors.New("Error reading bindings.json: " + err.Error())
 		}
 
-		key, ok := findEvent(k)
-		if !ok {
-			return errors.New("Invalid event " + k)
+		key, err := findEvent(k)
+		if err != nil {
+			return err
 		}
 
 		for ev := range parsed {
-			if e, ok := findEvent(ev); ok {
+			if e, err := findEvent(ev); err == nil {
 				if e == key {
 					delete(parsed, ev)
 					break
@@ -245,9 +319,9 @@ func UnbindKey(k string) error {
 			}
 		}
 
-		defaults := DefaultBindings()
+		defaults := DefaultBindings("buffer")
 		if a, ok := defaults[k]; ok {
-			BindKey(k, a)
+			BindKey(k, a, Binder["buffer"])
 		} else if _, ok := config.Bindings[k]; ok {
 			BufUnmap(key)
 			delete(config.Bindings, k)
@@ -260,9 +334,9 @@ func UnbindKey(k string) error {
 }
 
 var mouseEvents = map[string]tcell.ButtonMask{
-	"MouseLeft":       tcell.Button1,
-	"MouseMiddle":     tcell.Button2,
-	"MouseRight":      tcell.Button3,
+	"MouseLeft":       tcell.ButtonPrimary,
+	"MouseMiddle":     tcell.ButtonMiddle,
+	"MouseRight":      tcell.ButtonSecondary,
 	"MouseWheelUp":    tcell.WheelUp,
 	"MouseWheelDown":  tcell.WheelDown,
 	"MouseWheelLeft":  tcell.WheelLeft,

internal/action/bufpane.go

@@ -8,24 +8,33 @@ import (
 
 	lua "github.com/yuin/gopher-lua"
 	"github.com/zyedidia/micro/v2/internal/buffer"
+	"github.com/zyedidia/micro/v2/internal/clipboard"
 	"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"
+	"github.com/zyedidia/tcell/v2"
 )
 
 type BufKeyAction func(*BufPane) bool
 type BufMouseAction func(*BufPane, *tcell.EventMouse) bool
 
-var BufKeyBindings map[Event]BufKeyAction
-var BufKeyStrings map[Event]string
-var BufMouseBindings map[MouseEvent]BufMouseAction
+var BufBindings *KeyTree
+
+func BufKeyActionGeneral(a BufKeyAction) PaneKeyAction {
+	return func(p Pane) bool {
+		return a(p.(*BufPane))
+	}
+}
+
+func BufMouseActionGeneral(a BufMouseAction) PaneMouseAction {
+	return func(p Pane, me *tcell.EventMouse) bool {
+		return a(p.(*BufPane), me)
+	}
+}
 
 func init() {
-	BufKeyBindings = make(map[Event]BufKeyAction)
-	BufKeyStrings = make(map[Event]string)
-	BufMouseBindings = make(map[MouseEvent]BufMouseAction)
+	BufBindings = NewKeyTree()
 }
 
 func LuaAction(fn string) func(*BufPane) bool {
@@ -51,9 +60,17 @@ func LuaAction(fn string) func(*BufPane) bool {
 	}
 }
 
-// BufMapKey maps a key event to an action
-func BufMapKey(k Event, action string) {
-	BufKeyStrings[k] = action
+// BufMapKey maps an event to an action
+func BufMapEvent(k Event, action string) {
+	switch e := k.(type) {
+	case KeyEvent, KeySequenceEvent, RawEvent:
+		bufMapKey(e, action)
+	case MouseEvent:
+		bufMapMouse(e, action)
+	}
+}
+
+func bufMapKey(k Event, action string) {
 	var actionfns []func(*BufPane) bool
 	var names []string
 	var types []byte
@@ -108,10 +125,11 @@ func BufMapKey(k Event, action string) {
 		}
 		actionfns = append(actionfns, afn)
 	}
-	BufKeyBindings[k] = func(h *BufPane) bool {
+	bufAction := func(h *BufPane) bool {
 		cursors := h.Buf.GetCursors()
 		success := true
 		for i, a := range actionfns {
+			innerSuccess := true
 			for j, c := range cursors {
 				if c == nil {
 					continue
@@ -119,35 +137,41 @@ func BufMapKey(k Event, action string) {
 				h.Buf.SetCurCursor(c.Num)
 				h.Cursor = c
 				if i == 0 || (success && types[i-1] == '&') || (!success && types[i-1] == '|') || (types[i-1] == ',') {
-					success = h.execAction(a, names[i], j)
+					innerSuccess = innerSuccess && h.execAction(a, names[i], j)
 				} else {
 					break
 				}
 			}
+			// if the action changed the current pane, update the reference
+			h = MainTab().CurPane()
+			success = innerSuccess
 		}
 		return true
 	}
+
+	BufBindings.RegisterKeyBinding(k, BufKeyActionGeneral(bufAction))
 }
 
 // BufMapMouse maps a mouse event to an action
-func BufMapMouse(k MouseEvent, action string) {
+func bufMapMouse(k MouseEvent, action string) {
 	if f, ok := BufMouseActions[action]; ok {
-		BufMouseBindings[k] = f
+		BufBindings.RegisterMouseBinding(k, BufMouseActionGeneral(f))
 	} else {
-		delete(BufMouseBindings, k)
-		BufMapKey(k, action)
+		// TODO
+		// delete(BufMouseBindings, k)
+		bufMapKey(k, action)
 	}
 }
 
 // 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)
-	}
+	// TODO
+	// delete(BufKeyBindings, k)
+	//
+	// switch e := k.(type) {
+	// case MouseEvent:
+	// 	delete(BufMouseBindings, e)
+	// }
 }
 
 // The BufPane connects the buffer and the window
@@ -158,9 +182,13 @@ func BufUnmap(k Event) {
 type BufPane struct {
 	display.BWindow
 
+	// Buf is the buffer this BufPane views
 	Buf *buffer.Buffer
+	// Bindings stores the association of key events and actions
+	bindings *KeyTree
 
-	Cursor *buffer.Cursor // the active cursor
+	// Cursor is the currently active buffer cursor
+	Cursor *buffer.Cursor
 
 	// Since tcell doesn't differentiate between a mouse release event
 	// and a mouse move event with no keys pressed, we need to keep
@@ -317,7 +345,7 @@ func (h *BufPane) HandleEvent(event tcell.Event) {
 	case *tcell.EventKey:
 		ke := KeyEvent{
 			code: e.Key(),
-			mod:  e.Modifiers(),
+			mod:  metaToAlt(e.Modifiers()),
 			r:    e.Rune(),
 		}
 
@@ -330,7 +358,7 @@ func (h *BufPane) HandleEvent(event tcell.Event) {
 		switch e.Buttons() {
 		case tcell.Button1:
 			_, my := e.Position()
-			if h.Buf.Settings["statusline"].(bool) && my >= h.GetView().Y+h.GetView().Height-1 {
+			if h.Buf.Type.Kind != buffer.BTInfo.Kind && h.Buf.Settings["statusline"].(bool) && my >= h.GetView().Y+h.GetView().Height-1 {
 				cancel = true
 			}
 		case tcell.ButtonNone:
@@ -358,7 +386,7 @@ func (h *BufPane) HandleEvent(event tcell.Event) {
 				// 	h.Cursor.SetSelectionEnd(h.Cursor.Loc)
 				// }
 				if h.Cursor.HasSelection() {
-					h.Cursor.CopySelection("primary")
+					h.Cursor.CopySelection(clipboard.PrimaryReg)
 				}
 				h.mouseReleased = true
 			}
@@ -367,7 +395,7 @@ func (h *BufPane) HandleEvent(event tcell.Event) {
 		if !cancel {
 			me := MouseEvent{
 				btn: e.Buttons(),
-				mod: e.Modifiers(),
+				mod: metaToAlt(e.Modifiers()),
 			}
 			h.DoMouseEvent(me, e)
 		}
@@ -391,13 +419,26 @@ func (h *BufPane) HandleEvent(event tcell.Event) {
 	}
 }
 
+func (h *BufPane) Bindings() *KeyTree {
+	if h.bindings != nil {
+		return h.bindings
+	}
+	return BufBindings
+}
+
 // DoKeyEvent executes a key event by finding the action it is bound
 // to and executing it (possibly multiple times for multiple cursors)
 func (h *BufPane) DoKeyEvent(e Event) bool {
-	if action, ok := BufKeyBindings[e]; ok {
-		return action(h)
+	binds := h.Bindings()
+	action, more := binds.NextEvent(e, nil)
+	if action != nil && !more {
+		action(h)
+		binds.ResetEvents()
+		return true
+	} else if action == nil && !more {
+		binds.ResetEvents()
 	}
-	return false
+	return more
 }
 
 func (h *BufPane) execAction(action func(*BufPane) bool, name string, cursor int) bool {
@@ -431,22 +472,34 @@ func (h *BufPane) completeAction(action string) {
 }
 
 func (h *BufPane) HasKeyEvent(e Event) bool {
-	_, ok := BufKeyBindings[e]
-	return ok
+	// TODO
+	return true
+	// _, ok := BufKeyBindings[e]
+	// return ok
 }
 
 // DoMouseEvent executes a mouse event by finding the action it is bound
 // to and executing it
 func (h *BufPane) DoMouseEvent(e MouseEvent, te *tcell.EventMouse) bool {
-	if action, ok := BufMouseBindings[e]; ok {
-		if action(h, te) {
-			h.Relocate()
-		}
+	binds := h.Bindings()
+	action, _ := binds.NextEvent(e, te)
+	if action != nil {
+		action(h)
+		binds.ResetEvents()
 		return true
-	} else if h.HasKeyEvent(e) {
-		return h.DoKeyEvent(e)
 	}
+	// TODO
 	return false
+
+	// if action, ok := BufMouseBindings[e]; ok {
+	// 	if action(h, te) {
+	// 		h.Relocate()
+	// 	}
+	// 	return true
+	// } else if h.HasKeyEvent(e) {
+	// 	return h.DoKeyEvent(e)
+	// }
+	// return false
 }
 
 // DoRuneInsert inserts a given rune into the current buffer
@@ -633,6 +686,8 @@ var BufKeyActions = map[string]BufKeyAction{
 	"SkipMultiCursor":           (*BufPane).SkipMultiCursor,
 	"JumpToMatchingBrace":       (*BufPane).JumpToMatchingBrace,
 	"JumpLine":                  (*BufPane).JumpLine,
+	"Deselect":                  (*BufPane).Deselect,
+	"ClearInfo":                 (*BufPane).ClearInfo,
 	"None":                      (*BufPane).None,
 
 	// This was changed to InsertNewline but I don't want to break backwards compatibility
@@ -684,6 +739,7 @@ var MultiActions = map[string]bool{
 	"FindNext":                  true,
 	"FindPrevious":              true,
 	"CopyLine":                  true,
+	"Copy":                      true,
 	"Cut":                       true,
 	"CutLine":                   true,
 	"DuplicateLine":             true,

internal/action/command.go

@@ -13,6 +13,7 @@ import (
 
 	shellquote "github.com/kballard/go-shellquote"
 	"github.com/zyedidia/micro/v2/internal/buffer"
+	"github.com/zyedidia/micro/v2/internal/clipboard"
 	"github.com/zyedidia/micro/v2/internal/config"
 	"github.com/zyedidia/micro/v2/internal/screen"
 	"github.com/zyedidia/micro/v2/internal/shell"
@@ -339,7 +340,10 @@ func ReloadConfig() {
 	if err != nil {
 		screen.TermMessage(err)
 	}
-	config.InitGlobalSettings()
+	err = config.InitGlobalSettings()
+	if err != nil {
+		screen.TermMessage(err)
+	}
 	InitBindings()
 	InitCommands()
 
@@ -477,6 +481,7 @@ func SetGlobalOptionNative(option string, nativeValue interface{}) error {
 
 	if !local {
 		config.GlobalSettings[option] = nativeValue
+		config.ModifiedSettings[option] = true
 
 		if option == "colorscheme" {
 			// LoadSyntaxFiles()
@@ -501,6 +506,12 @@ func SetGlobalOptionNative(option string, nativeValue interface{}) error {
 			}
 		} else if option == "paste" {
 			screen.Screen.SetPaste(nativeValue.(bool))
+		} else if option == "clipboard" {
+			m := clipboard.SetMethod(nativeValue.(string))
+			err := clipboard.Initialize(m)
+			if err != nil {
+				return err
+			}
 		} else {
 			for _, pl := range config.Plugins {
 				if option == pl.Name {
@@ -630,7 +641,12 @@ func (h *BufPane) ShowKeyCmd(args []string) {
 		return
 	}
 
-	if action, ok := config.Bindings[args[0]]; ok {
+	event, err := findEvent(args[0])
+	if err != nil {
+		InfoBar.Error(err)
+		return
+	}
+	if action, ok := config.Bindings[event.Name()]; ok {
 		InfoBar.Message(action)
 	} else {
 		InfoBar.Message(args[0], " has no binding")
@@ -701,6 +717,9 @@ func (h *BufPane) GotoCmd(args []string) {
 				InfoBar.Error(err)
 				return
 			}
+			if line < 0 {
+				line = h.Buf.LinesNum() + 1 + line
+			}
 			line = util.Clamp(line-1, 0, h.Buf.LinesNum()-1)
 			col = util.Clamp(col-1, 0, util.CharacterCount(h.Buf.LineBytes(line)))
 			h.Cursor.GotoLoc(buffer.Loc{col, line})
@@ -710,6 +729,9 @@ func (h *BufPane) GotoCmd(args []string) {
 				InfoBar.Error(err)
 				return
 			}
+			if line < 0 {
+				line = h.Buf.LinesNum() + 1 + line
+			}
 			line = util.Clamp(line-1, 0, h.Buf.LinesNum()-1)
 			h.Cursor.GotoLoc(buffer.Loc{0, line})
 		}
@@ -795,7 +817,7 @@ func (h *BufPane) ReplaceCmd(args []string) {
 			return l.GreaterEqual(start) && l.LessEqual(end)
 		}
 
-		searchLoc := start
+		searchLoc := h.Cursor.Loc
 		var doReplacement func()
 		doReplacement = func() {
 			locs, found, err := h.Buf.FindNext(search, start, end, searchLoc, true, !noRegex)
@@ -806,6 +828,7 @@ func (h *BufPane) ReplaceCmd(args []string) {
 			if !found || !inRange(locs[0]) || !inRange(locs[1]) {
 				h.Cursor.ResetSelection()
 				h.Buf.RelocateCursors()
+
 				return
 			}
 
@@ -821,7 +844,9 @@ func (h *BufPane) ReplaceCmd(args []string) {
 
 					searchLoc = locs[0]
 					searchLoc.X += nrunes + locs[0].Diff(locs[1], h.Buf)
-					end.Move(nrunes, h.Buf)
+					if end.Y == locs[1].Y {
+						end = end.Move(nrunes, h.Buf)
+					}
 					h.Cursor.Loc = searchLoc
 					nreplaced++
 				} else if !canceled && !yes {

internal/action/defaults.go

@@ -0,0 +1,21 @@
+package action
+
+var termdefaults = map[string]string{
+	"<Ctrl-q><Ctrl-q>": "Exit",
+	"<Ctrl-e><Ctrl-e>": "CommandMode",
+	"<Ctrl-w><Ctrl-w>": "NextSplit",
+}
+
+// DefaultBindings returns a map containing micro's default keybindings
+func DefaultBindings(pane string) map[string]string {
+	switch pane {
+	case "command":
+		return infodefaults
+	case "buffer":
+		return bufdefaults
+	case "terminal":
+		return termdefaults
+	default:
+		return map[string]string{}
+	}
+}

internal/action/defaults_darwin.go

@@ -1,107 +1,179 @@
 package action
 
-// DefaultBindings returns a map containing micro's default keybindings
-func DefaultBindings() map[string]string {
-	return map[string]string{
-		"Up":             "CursorUp",
-		"Down":           "CursorDown",
-		"Right":          "CursorRight",
-		"Left":           "CursorLeft",
-		"ShiftUp":        "SelectUp",
-		"ShiftDown":      "SelectDown",
-		"ShiftLeft":      "SelectLeft",
-		"ShiftRight":     "SelectRight",
-		"AltLeft":        "WordLeft",
-		"AltRight":       "WordRight",
-		"AltUp":          "MoveLinesUp",
-		"AltDown":        "MoveLinesDown",
-		"AltShiftRight":  "SelectWordRight",
-		"AltShiftLeft":   "SelectWordLeft",
-		"CtrlLeft":       "StartOfTextToggle",
-		"CtrlRight":      "EndOfLine",
-		"CtrlShiftLeft":  "SelectToStartOfTextToggle",
-		"ShiftHome":      "SelectToStartOfTextToggle",
-		"CtrlShiftRight": "SelectToEndOfLine",
-		"ShiftEnd":       "SelectToEndOfLine",
-		"CtrlUp":         "CursorStart",
-		"CtrlDown":       "CursorEnd",
-		"CtrlShiftUp":    "SelectToStart",
-		"CtrlShiftDown":  "SelectToEnd",
-		"Alt-{":          "ParagraphPrevious",
-		"Alt-}":          "ParagraphNext",
-		"Enter":          "InsertNewline",
-		"CtrlH":          "Backspace",
-		"Backspace":      "Backspace",
-		"Alt-CtrlH":      "DeleteWordLeft",
-		"Alt-Backspace":  "DeleteWordLeft",
-		"Tab":            "Autocomplete|IndentSelection|InsertTab",
-		"Backtab":        "CycleAutocompleteBack|OutdentSelection|OutdentLine",
-		"CtrlO":          "OpenFile",
-		"CtrlS":          "Save",
-		"CtrlF":          "Find",
-		"CtrlN":          "FindNext",
-		"CtrlP":          "FindPrevious",
-		"CtrlZ":          "Undo",
-		"CtrlY":          "Redo",
-		"CtrlC":          "CopyLine|Copy",
-		"CtrlX":          "Cut",
-		"CtrlK":          "CutLine",
-		"CtrlD":          "DuplicateLine",
-		"CtrlV":          "Paste",
-		"CtrlA":          "SelectAll",
-		"CtrlT":          "AddTab",
-		"Alt,":           "PreviousTab",
-		"Alt.":           "NextTab",
-		"Home":           "StartOfTextToggle",
-		"End":            "EndOfLine",
-		"CtrlHome":       "CursorStart",
-		"CtrlEnd":        "CursorEnd",
-		"PageUp":         "CursorPageUp",
-		"PageDown":       "CursorPageDown",
-		"CtrlPageUp":     "PreviousTab",
-		"CtrlPageDown":   "NextTab",
-		"CtrlG":          "ToggleHelp",
-		"Alt-g":          "ToggleKeyMenu",
-		"CtrlR":          "ToggleRuler",
-		"CtrlL":          "command-edit:goto ",
-		"Delete":         "Delete",
-		"CtrlB":          "ShellMode",
-		"CtrlQ":          "Quit",
-		"CtrlE":          "CommandMode",
-		"CtrlW":          "NextSplit",
-		"CtrlU":          "ToggleMacro",
-		"CtrlJ":          "PlayMacro",
-		"Insert":         "ToggleOverwriteMode",
+var bufdefaults = map[string]string{
+	"Up":             "CursorUp",
+	"Down":           "CursorDown",
+	"Right":          "CursorRight",
+	"Left":           "CursorLeft",
+	"ShiftUp":        "SelectUp",
+	"ShiftDown":      "SelectDown",
+	"ShiftLeft":      "SelectLeft",
+	"ShiftRight":     "SelectRight",
+	"AltLeft":        "WordLeft",
+	"AltRight":       "WordRight",
+	"AltUp":          "MoveLinesUp",
+	"AltDown":        "MoveLinesDown",
+	"AltShiftRight":  "SelectWordRight",
+	"AltShiftLeft":   "SelectWordLeft",
+	"CtrlLeft":       "StartOfTextToggle",
+	"CtrlRight":      "EndOfLine",
+	"CtrlShiftLeft":  "SelectToStartOfTextToggle",
+	"ShiftHome":      "SelectToStartOfTextToggle",
+	"CtrlShiftRight": "SelectToEndOfLine",
+	"ShiftEnd":       "SelectToEndOfLine",
+	"CtrlUp":         "CursorStart",
+	"CtrlDown":       "CursorEnd",
+	"CtrlShiftUp":    "SelectToStart",
+	"CtrlShiftDown":  "SelectToEnd",
+	"Alt-{":          "ParagraphPrevious",
+	"Alt-}":          "ParagraphNext",
+	"Enter":          "InsertNewline",
+	"CtrlH":          "Backspace",
+	"Backspace":      "Backspace",
+	"OldBackspace":   "Backspace",
+	"Alt-CtrlH":      "DeleteWordLeft",
+	"Alt-Backspace":  "DeleteWordLeft",
+	"Tab":            "Autocomplete|IndentSelection|InsertTab",
+	"Backtab":        "CycleAutocompleteBack|OutdentSelection|OutdentLine",
+	"Ctrl-o":         "OpenFile",
+	"Ctrl-s":         "Save",
+	"Ctrl-f":         "Find",
+	"Ctrl-n":         "FindNext",
+	"Ctrl-p":         "FindPrevious",
+	"Ctrl-z":         "Undo",
+	"Ctrl-y":         "Redo",
+	"Ctrl-c":         "CopyLine|Copy",
+	"Ctrl-x":         "Cut",
+	"Ctrl-k":         "CutLine",
+	"Ctrl-d":         "DuplicateLine",
+	"Ctrl-v":         "Paste",
+	"Ctrl-a":         "SelectAll",
+	"Ctrl-t":         "AddTab",
+	"Alt-,":          "PreviousTab",
+	"Alt-.":          "NextTab",
+	"Home":           "StartOfTextToggle",
+	"End":            "EndOfLine",
+	"CtrlHome":       "CursorStart",
+	"CtrlEnd":        "CursorEnd",
+	"PageUp":         "CursorPageUp",
+	"PageDown":       "CursorPageDown",
+	"CtrlPageUp":     "PreviousTab",
+	"CtrlPageDown":   "NextTab",
+	"Ctrl-g":         "ToggleHelp",
+	"Alt-g":          "ToggleKeyMenu",
+	"Ctrl-r":         "ToggleRuler",
+	"Ctrl-l":         "command-edit:goto ",
+	"Delete":         "Delete",
+	"Ctrl-b":         "ShellMode",
+	"Ctrl-q":         "Quit",
+	"Ctrl-e":         "CommandMode",
+	"Ctrl-w":         "NextSplit",
+	"Ctrl-u":         "ToggleMacro",
+	"Ctrl-j":         "PlayMacro",
+	"Insert":         "ToggleOverwriteMode",
 
-		// Emacs-style keybindings
-		"Alt-f": "WordRight",
-		"Alt-b": "WordLeft",
-		"Alt-a": "StartOfText",
-		"Alt-e": "EndOfLine",
-		// "Alt-p": "CursorUp",
-		// "Alt-n": "CursorDown",
+	// Emacs-style keybindings
+	"Alt-f": "WordRight",
+	"Alt-b": "WordLeft",
+	"Alt-a": "StartOfText",
+	"Alt-e": "EndOfLine",
+	// "Alt-p": "CursorUp",
+	// "Alt-n": "CursorDown",
 
-		// Integration with file managers
-		"F2":  "Save",
-		"F3":  "Find",
-		"F4":  "Quit",
-		"F7":  "Find",
-		"F10": "Quit",
-		"Esc": "Escape",
+	// Integration with file managers
+	"F2":  "Save",
+	"F3":  "Find",
+	"F4":  "Quit",
+	"F7":  "Find",
+	"F10": "Quit",
+	"Esc": "Escape,Deselect,ClearInfo,RemoveAllMultiCursors",
 
-		// Mouse bindings
-		"MouseWheelUp":   "ScrollUp",
-		"MouseWheelDown": "ScrollDown",
-		"MouseLeft":      "MousePress",
-		"MouseMiddle":    "PastePrimary",
-		"Ctrl-MouseLeft": "MouseMultiCursor",
+	// Mouse bindings
+	"MouseWheelUp":   "ScrollUp",
+	"MouseWheelDown": "ScrollDown",
+	"MouseLeft":      "MousePress",
+	"MouseMiddle":    "PastePrimary",
+	"Ctrl-MouseLeft": "MouseMultiCursor",
 
-		"Alt-n":        "SpawnMultiCursor",
-		"AltShiftUp":   "SpawnMultiCursorUp",
-		"AltShiftDown": "SpawnMultiCursorDown",
-		"Alt-m":        "SpawnMultiCursorSelect",
-		"Alt-p":        "RemoveMultiCursor",
-		"Alt-c":        "RemoveAllMultiCursors",
-		"Alt-x":        "SkipMultiCursor",
-	}
+	"Alt-n":        "SpawnMultiCursor",
+	"AltShiftUp":   "SpawnMultiCursorUp",
+	"AltShiftDown": "SpawnMultiCursorDown",
+	"Alt-m":        "SpawnMultiCursorSelect",
+	"Alt-p":        "RemoveMultiCursor",
+	"Alt-c":        "RemoveAllMultiCursors",
+	"Alt-x":        "SkipMultiCursor",
+}
+
+var infodefaults = map[string]string{
+	"Up":             "HistoryUp",
+	"Down":           "HistoryDown",
+	"Right":          "CursorRight",
+	"Left":           "CursorLeft",
+	"ShiftUp":        "SelectUp",
+	"ShiftDown":      "SelectDown",
+	"ShiftLeft":      "SelectLeft",
+	"ShiftRight":     "SelectRight",
+	"AltLeft":        "WordLeft",
+	"AltRight":       "WordRight",
+	"AltUp":          "CursorStart",
+	"AltDown":        "CursorEnd",
+	"AltShiftRight":  "SelectWordRight",
+	"AltShiftLeft":   "SelectWordLeft",
+	"CtrlLeft":       "StartOfTextToggle",
+	"CtrlRight":      "EndOfLine",
+	"CtrlShiftLeft":  "SelectToStartOfTextToggle",
+	"ShiftHome":      "SelectToStartOfTextToggle",
+	"CtrlShiftRight": "SelectToEndOfLine",
+	"ShiftEnd":       "SelectToEndOfLine",
+	"CtrlUp":         "CursorStart",
+	"CtrlDown":       "CursorEnd",
+	"CtrlShiftUp":    "SelectToStart",
+	"CtrlShiftDown":  "SelectToEnd",
+	"Enter":          "ExecuteCommand",
+	"CtrlH":          "Backspace",
+	"Backspace":      "Backspace",
+	"OldBackspace":   "Backspace",
+	"Alt-CtrlH":      "DeleteWordLeft",
+	"Alt-Backspace":  "DeleteWordLeft",
+	"Tab":            "CommandComplete",
+	"Backtab":        "CycleAutocompleteBack",
+	"Ctrl-z":         "Undo",
+	"Ctrl-y":         "Redo",
+	"Ctrl-c":         "CopyLine|Copy",
+	"Ctrl-x":         "Cut",
+	"Ctrl-k":         "CutLine",
+	"Ctrl-v":         "Paste",
+	"Home":           "StartOfTextToggle",
+	"End":            "EndOfLine",
+	"CtrlHome":       "CursorStart",
+	"CtrlEnd":        "CursorEnd",
+	"Delete":         "Delete",
+	"Ctrl-q":         "AbortCommand",
+	"Ctrl-e":         "EndOfLine",
+	"Ctrl-a":         "StartOfLine",
+	"Ctrl-w":         "DeleteWordLeft",
+	"Insert":         "ToggleOverwriteMode",
+	"Ctrl-b":         "WordLeft",
+	"Ctrl-f":         "WordRight",
+	"Ctrl-d":         "DeleteWordLeft",
+	"Ctrl-m":         "ExecuteCommand",
+	"Ctrl-n":         "HistoryDown",
+	"Ctrl-p":         "HistoryUp",
+	"Ctrl-u":         "SelectToStart",
+
+	// Emacs-style keybindings
+	"Alt-f": "WordRight",
+	"Alt-b": "WordLeft",
+	"Alt-a": "StartOfText",
+	"Alt-e": "EndOfLine",
+
+	// Integration with file managers
+	"F10": "AbortCommand",
+	"Esc": "AbortCommand",
+
+	// Mouse bindings
+	"MouseWheelUp":   "HistoryUp",
+	"MouseWheelDown": "HistoryDown",
+	"MouseLeft":      "MousePress",
+	"MouseMiddle":    "PastePrimary",
 }

internal/action/defaults_other.go

@@ -2,108 +2,180 @@
 
 package action
 
-// DefaultBindings returns a map containing micro's default keybindings
-func DefaultBindings() map[string]string {
-	return map[string]string{
-		"Up":             "CursorUp",
-		"Down":           "CursorDown",
-		"Right":          "CursorRight",
-		"Left":           "CursorLeft",
-		"ShiftUp":        "SelectUp",
-		"ShiftDown":      "SelectDown",
-		"ShiftLeft":      "SelectLeft",
-		"ShiftRight":     "SelectRight",
-		"CtrlLeft":       "WordLeft",
-		"CtrlRight":      "WordRight",
-		"AltUp":          "MoveLinesUp",
-		"AltDown":        "MoveLinesDown",
-		"CtrlShiftRight": "SelectWordRight",
-		"CtrlShiftLeft":  "SelectWordLeft",
-		"AltLeft":        "StartOfTextToggle",
-		"AltRight":       "EndOfLine",
-		"AltShiftLeft":   "SelectToStartOfTextToggle",
-		"ShiftHome":      "SelectToStartOfTextToggle",
-		"AltShiftRight":  "SelectToEndOfLine",
-		"ShiftEnd":       "SelectToEndOfLine",
-		"CtrlUp":         "CursorStart",
-		"CtrlDown":       "CursorEnd",
-		"CtrlShiftUp":    "SelectToStart",
-		"CtrlShiftDown":  "SelectToEnd",
-		"Alt-{":          "ParagraphPrevious",
-		"Alt-}":          "ParagraphNext",
-		"Enter":          "InsertNewline",
-		"CtrlH":          "Backspace",
-		"Backspace":      "Backspace",
-		"Alt-CtrlH":      "DeleteWordLeft",
-		"Alt-Backspace":  "DeleteWordLeft",
-		"Tab":            "Autocomplete|IndentSelection|InsertTab",
-		"Backtab":        "CycleAutocompleteBack|OutdentSelection|OutdentLine",
-		"CtrlO":          "OpenFile",
-		"CtrlS":          "Save",
-		"CtrlF":          "Find",
-		"CtrlN":          "FindNext",
-		"CtrlP":          "FindPrevious",
-		"CtrlZ":          "Undo",
-		"CtrlY":          "Redo",
-		"CtrlC":          "CopyLine|Copy",
-		"CtrlX":          "Cut",
-		"CtrlK":          "CutLine",
-		"CtrlD":          "DuplicateLine",
-		"CtrlV":          "Paste",
-		"CtrlA":          "SelectAll",
-		"CtrlT":          "AddTab",
-		"Alt,":           "PreviousTab",
-		"Alt.":           "NextTab",
-		"Home":           "StartOfTextToggle",
-		"End":            "EndOfLine",
-		"CtrlHome":       "CursorStart",
-		"CtrlEnd":        "CursorEnd",
-		"PageUp":         "CursorPageUp",
-		"PageDown":       "CursorPageDown",
-		"CtrlPageUp":     "PreviousTab",
-		"CtrlPageDown":   "NextTab",
-		"CtrlG":          "ToggleHelp",
-		"Alt-g":          "ToggleKeyMenu",
-		"CtrlR":          "ToggleRuler",
-		"CtrlL":          "command-edit:goto ",
-		"Delete":         "Delete",
-		"CtrlB":          "ShellMode",
-		"CtrlQ":          "Quit",
-		"CtrlE":          "CommandMode",
-		"CtrlW":          "NextSplit",
-		"CtrlU":          "ToggleMacro",
-		"CtrlJ":          "PlayMacro",
-		"Insert":         "ToggleOverwriteMode",
+var bufdefaults = map[string]string{
+	"Up":             "CursorUp",
+	"Down":           "CursorDown",
+	"Right":          "CursorRight",
+	"Left":           "CursorLeft",
+	"ShiftUp":        "SelectUp",
+	"ShiftDown":      "SelectDown",
+	"ShiftLeft":      "SelectLeft",
+	"ShiftRight":     "SelectRight",
+	"CtrlLeft":       "WordLeft",
+	"CtrlRight":      "WordRight",
+	"AltUp":          "MoveLinesUp",
+	"AltDown":        "MoveLinesDown",
+	"CtrlShiftRight": "SelectWordRight",
+	"CtrlShiftLeft":  "SelectWordLeft",
+	"AltLeft":        "StartOfTextToggle",
+	"AltRight":       "EndOfLine",
+	"AltShiftLeft":   "SelectToStartOfTextToggle",
+	"ShiftHome":      "SelectToStartOfTextToggle",
+	"AltShiftRight":  "SelectToEndOfLine",
+	"ShiftEnd":       "SelectToEndOfLine",
+	"CtrlUp":         "CursorStart",
+	"CtrlDown":       "CursorEnd",
+	"CtrlShiftUp":    "SelectToStart",
+	"CtrlShiftDown":  "SelectToEnd",
+	"Alt-{":          "ParagraphPrevious",
+	"Alt-}":          "ParagraphNext",
+	"Enter":          "InsertNewline",
+	"CtrlH":          "Backspace",
+	"Backspace":      "Backspace",
+	"OldBackspace":   "Backspace",
+	"Alt-CtrlH":      "DeleteWordLeft",
+	"Alt-Backspace":  "DeleteWordLeft",
+	"Tab":            "Autocomplete|IndentSelection|InsertTab",
+	"Backtab":        "CycleAutocompleteBack|OutdentSelection|OutdentLine",
+	"Ctrl-o":         "OpenFile",
+	"Ctrl-s":         "Save",
+	"Ctrl-f":         "Find",
+	"Ctrl-n":         "FindNext",
+	"Ctrl-p":         "FindPrevious",
+	"Ctrl-z":         "Undo",
+	"Ctrl-y":         "Redo",
+	"Ctrl-c":         "CopyLine|Copy",
+	"Ctrl-x":         "Cut",
+	"Ctrl-k":         "CutLine",
+	"Ctrl-d":         "DuplicateLine",
+	"Ctrl-v":         "Paste",
+	"Ctrl-a":         "SelectAll",
+	"Ctrl-t":         "AddTab",
+	"Alt-,":          "PreviousTab",
+	"Alt-.":          "NextTab",
+	"Home":           "StartOfTextToggle",
+	"End":            "EndOfLine",
+	"CtrlHome":       "CursorStart",
+	"CtrlEnd":        "CursorEnd",
+	"PageUp":         "CursorPageUp",
+	"PageDown":       "CursorPageDown",
+	"CtrlPageUp":     "PreviousTab",
+	"CtrlPageDown":   "NextTab",
+	"Ctrl-g":         "ToggleHelp",
+	"Alt-g":          "ToggleKeyMenu",
+	"Ctrl-r":         "ToggleRuler",
+	"Ctrl-l":         "command-edit:goto ",
+	"Delete":         "Delete",
+	"Ctrl-b":         "ShellMode",
+	"Ctrl-q":         "Quit",
+	"Ctrl-e":         "CommandMode",
+	"Ctrl-w":         "NextSplit",
+	"Ctrl-u":         "ToggleMacro",
+	"Ctrl-j":         "PlayMacro",
+	"Insert":         "ToggleOverwriteMode",
 
-		// Emacs-style keybindings
-		"Alt-f": "WordRight",
-		"Alt-b": "WordLeft",
-		"Alt-a": "StartOfText",
-		"Alt-e": "EndOfLine",
-		// "Alt-p": "CursorUp",
-		// "Alt-n": "CursorDown",
+	// Emacs-style keybindings
+	"Alt-f": "WordRight",
+	"Alt-b": "WordLeft",
+	"Alt-a": "StartOfText",
+	"Alt-e": "EndOfLine",
+	// "Alt-p": "CursorUp",
+	// "Alt-n": "CursorDown",
 
-		// Integration with file managers
-		"F2":  "Save",
-		"F3":  "Find",
-		"F4":  "Quit",
-		"F7":  "Find",
-		"F10": "Quit",
-		"Esc": "Escape",
+	// Integration with file managers
+	"F2":  "Save",
+	"F3":  "Find",
+	"F4":  "Quit",
+	"F7":  "Find",
+	"F10": "Quit",
+	"Esc": "Escape,Deselect,ClearInfo,RemoveAllMultiCursors",
 
-		// Mouse bindings
-		"MouseWheelUp":   "ScrollUp",
-		"MouseWheelDown": "ScrollDown",
-		"MouseLeft":      "MousePress",
-		"MouseMiddle":    "PastePrimary",
-		"Ctrl-MouseLeft": "MouseMultiCursor",
+	// Mouse bindings
+	"MouseWheelUp":   "ScrollUp",
+	"MouseWheelDown": "ScrollDown",
+	"MouseLeft":      "MousePress",
+	"MouseMiddle":    "PastePrimary",
+	"Ctrl-MouseLeft": "MouseMultiCursor",
 
-		"Alt-n":        "SpawnMultiCursor",
-		"Alt-m":        "SpawnMultiCursorSelect",
-		"AltShiftUp":   "SpawnMultiCursorUp",
-		"AltShiftDown": "SpawnMultiCursorDown",
-		"Alt-p":        "RemoveMultiCursor",
-		"Alt-c":        "RemoveAllMultiCursors",
-		"Alt-x":        "SkipMultiCursor",
-	}
+	"Alt-n":        "SpawnMultiCursor",
+	"Alt-m":        "SpawnMultiCursorSelect",
+	"AltShiftUp":   "SpawnMultiCursorUp",
+	"AltShiftDown": "SpawnMultiCursorDown",
+	"Alt-p":        "RemoveMultiCursor",
+	"Alt-c":        "RemoveAllMultiCursors",
+	"Alt-x":        "SkipMultiCursor",
+}
+
+var infodefaults = map[string]string{
+	"Up":             "HistoryUp",
+	"Down":           "HistoryDown",
+	"Right":          "CursorRight",
+	"Left":           "CursorLeft",
+	"ShiftUp":        "SelectUp",
+	"ShiftDown":      "SelectDown",
+	"ShiftLeft":      "SelectLeft",
+	"ShiftRight":     "SelectRight",
+	"AltLeft":        "StartOfTextToggle",
+	"AltRight":       "EndOfLine",
+	"AltUp":          "CursorStart",
+	"AltDown":        "CursorEnd",
+	"AltShiftRight":  "SelectWordRight",
+	"AltShiftLeft":   "SelectWordLeft",
+	"CtrlLeft":       "WordLeft",
+	"CtrlRight":      "WordRight",
+	"CtrlShiftLeft":  "SelectToStartOfTextToggle",
+	"ShiftHome":      "SelectToStartOfTextToggle",
+	"CtrlShiftRight": "SelectToEndOfLine",
+	"ShiftEnd":       "SelectToEndOfLine",
+	"CtrlUp":         "CursorStart",
+	"CtrlDown":       "CursorEnd",
+	"CtrlShiftUp":    "SelectToStart",
+	"CtrlShiftDown":  "SelectToEnd",
+	"Enter":          "ExecuteCommand",
+	"CtrlH":          "Backspace",
+	"Backspace":      "Backspace",
+	"OldBackspace":   "Backspace",
+	"Alt-CtrlH":      "DeleteWordLeft",
+	"Alt-Backspace":  "DeleteWordLeft",
+	"Tab":            "CommandComplete",
+	"Backtab":        "CycleAutocompleteBack",
+	"Ctrl-z":         "Undo",
+	"Ctrl-y":         "Redo",
+	"Ctrl-c":         "CopyLine|Copy",
+	"Ctrl-x":         "Cut",
+	"Ctrl-k":         "CutLine",
+	"Ctrl-v":         "Paste",
+	"Home":           "StartOfTextToggle",
+	"End":            "EndOfLine",
+	"CtrlHome":       "CursorStart",
+	"CtrlEnd":        "CursorEnd",
+	"Delete":         "Delete",
+	"Ctrl-q":         "AbortCommand",
+	"Ctrl-e":         "EndOfLine",
+	"Ctrl-a":         "StartOfLine",
+	"Ctrl-w":         "DeleteWordLeft",
+	"Insert":         "ToggleOverwriteMode",
+	"Ctrl-b":         "WordLeft",
+	"Ctrl-f":         "WordRight",
+	"Ctrl-d":         "DeleteWordLeft",
+	"Ctrl-m":         "ExecuteCommand",
+	"Ctrl-n":         "HistoryDown",
+	"Ctrl-p":         "HistoryUp",
+	"Ctrl-u":         "SelectToStart",
+
+	// Emacs-style keybindings
+	"Alt-f": "WordRight",
+	"Alt-b": "WordLeft",
+	"Alt-a": "StartOfText",
+	"Alt-e": "EndOfLine",
+
+	// Integration with file managers
+	"F10": "AbortCommand",
+	"Esc": "AbortCommand",
+
+	// Mouse bindings
+	"MouseWheelUp":   "HistoryUp",
+	"MouseWheelDown": "HistoryDown",
+	"MouseLeft":      "MousePress",
+	"MouseMiddle":    "PastePrimary",
 }

internal/action/events.go

@@ -1,10 +1,17 @@
 package action
 
 import (
-	"github.com/zyedidia/tcell"
+	"bytes"
+	"errors"
+	"fmt"
+	"strings"
+
+	"github.com/zyedidia/tcell/v2"
 )
 
-type Event interface{}
+type Event interface {
+	Name() string
+}
 
 // RawEvent is simply an escape code
 // We allow users to directly bind escape codes
@@ -13,6 +20,10 @@ type RawEvent struct {
 	esc string
 }
 
+func (r RawEvent) Name() string {
+	return r.esc
+}
+
 // KeyEvent is a key event containing a key code,
 // some possible modifiers (alt, ctrl, etc...) and
 // a rune if it was simply a character press
@@ -22,6 +33,71 @@ type KeyEvent struct {
 	code tcell.Key
 	mod  tcell.ModMask
 	r    rune
+	any  bool
+}
+
+func metaToAlt(mod tcell.ModMask) tcell.ModMask {
+	if mod&tcell.ModMeta != 0 {
+		mod &= ^tcell.ModMeta
+		mod |= tcell.ModAlt
+	}
+	return mod
+}
+
+func (k KeyEvent) Name() string {
+	if k.any {
+		return "<any>"
+	}
+	s := ""
+	m := []string{}
+	if k.mod&tcell.ModShift != 0 {
+		m = append(m, "Shift")
+	}
+	if k.mod&tcell.ModAlt != 0 {
+		m = append(m, "Alt")
+	}
+	if k.mod&tcell.ModMeta != 0 {
+		m = append(m, "Meta")
+	}
+	if k.mod&tcell.ModCtrl != 0 {
+		m = append(m, "Ctrl")
+	}
+
+	ok := false
+	if s, ok = tcell.KeyNames[k.code]; !ok {
+		if k.code == tcell.KeyRune {
+			s = string(k.r)
+		} else {
+			s = fmt.Sprintf("Key[%d,%d]", k.code, int(k.r))
+		}
+	}
+	if len(m) != 0 {
+		if k.mod&tcell.ModCtrl != 0 && strings.HasPrefix(s, "Ctrl-") {
+			s = s[5:]
+			if len(s) == 1 {
+				s = strings.ToLower(s)
+			}
+		}
+		return fmt.Sprintf("%s-%s", strings.Join(m, "-"), s)
+	}
+	return s
+}
+
+// A KeySequence defines a list of consecutive
+// events. All events in the sequence must be KeyEvents
+// or MouseEvents.
+type KeySequenceEvent struct {
+	keys []Event
+}
+
+func (k KeySequenceEvent) Name() string {
+	buf := bytes.Buffer{}
+	for _, e := range k.keys {
+		buf.WriteByte('<')
+		buf.WriteString(e.Name())
+		buf.WriteByte('>')
+	}
+	return buf.String()
 }
 
 // MouseEvent is a mouse event with a mouse button and
@@ -31,8 +107,54 @@ type MouseEvent struct {
 	mod tcell.ModMask
 }
 
-type KeyAction func(Handler) bool
-type MouseAction func(Handler, tcell.EventMouse) bool
+func (m MouseEvent) Name() string {
+	mod := ""
+	if m.mod&tcell.ModShift != 0 {
+		mod = "Shift-"
+	}
+	if m.mod&tcell.ModAlt != 0 {
+		mod = "Alt-"
+	}
+	if m.mod&tcell.ModMeta != 0 {
+		mod = "Meta-"
+	}
+	if m.mod&tcell.ModCtrl != 0 {
+		mod = "Ctrl-"
+	}
+
+	for k, v := range mouseEvents {
+		if v == m.btn {
+			return fmt.Sprintf("%s%s", mod, k)
+		}
+	}
+	return ""
+}
+
+// ConstructEvent takes a tcell event and returns a micro
+// event. Note that tcell events can't express certain
+// micro events such as key sequences. This function is
+// mostly used for debugging/raw panes or constructing
+// intermediate micro events while parsing a sequence.
+func ConstructEvent(event tcell.Event) (Event, error) {
+	switch e := event.(type) {
+	case *tcell.EventKey:
+		return KeyEvent{
+			code: e.Key(),
+			mod:  metaToAlt(e.Modifiers()),
+			r:    e.Rune(),
+		}, nil
+	case *tcell.EventRaw:
+		return RawEvent{
+			esc: e.EscSeq(),
+		}, nil
+	case *tcell.EventMouse:
+		return MouseEvent{
+			btn: e.Buttons(),
+			mod: metaToAlt(e.Modifiers()),
+		}, nil
+	}
+	return nil, errors.New("No micro event equivalent")
+}
 
 // A Handler will take a tcell event and execute it
 // appropriately

internal/action/infocomplete.go

@@ -186,6 +186,16 @@ func OptionValueComplete(b *buffer.Buffer) ([]string, []string) {
 			if strings.HasPrefix("doas", input) {
 				suggestions = append(suggestions, "doas")
 			}
+		case "clipboard":
+			if strings.HasPrefix("external", input) {
+				suggestions = append(suggestions, "external")
+			}
+			if strings.HasPrefix("internal", input) {
+				suggestions = append(suggestions, "internal")
+			}
+			if strings.HasPrefix("terminal", input) {
+				suggestions = append(suggestions, "terminal")
+			}
 		}
 	}
 	sort.Strings(suggestions)

internal/action/infopane.go

@@ -2,17 +2,57 @@ package action
 
 import (
 	"bytes"
-	"strings"
 
 	"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"
+	"github.com/zyedidia/tcell/v2"
 )
 
 type InfoKeyAction func(*InfoPane)
 
+var InfoBindings *KeyTree
+var InfoBufBindings *KeyTree
+
+func init() {
+	InfoBindings = NewKeyTree()
+	InfoBufBindings = NewKeyTree()
+}
+
+func InfoMapEvent(k Event, action string) {
+	switch e := k.(type) {
+	case KeyEvent, KeySequenceEvent, RawEvent:
+		infoMapKey(e, action)
+	case MouseEvent:
+		infoMapMouse(e, action)
+	}
+}
+
+func infoMapKey(k Event, action string) {
+	if f, ok := InfoKeyActions[action]; ok {
+		InfoBindings.RegisterKeyBinding(k, InfoKeyActionGeneral(f))
+	} else if f, ok := BufKeyActions[action]; ok {
+		InfoBufBindings.RegisterKeyBinding(k, BufKeyActionGeneral(f))
+	}
+}
+
+func infoMapMouse(k MouseEvent, action string) {
+	// TODO: map mouse
+	if f, ok := BufMouseActions[action]; ok {
+		InfoBufBindings.RegisterMouseBinding(k, BufMouseActionGeneral(f))
+	} else {
+		infoMapKey(k, action)
+	}
+}
+
+func InfoKeyActionGeneral(a InfoKeyAction) PaneKeyAction {
+	return func(p Pane) bool {
+		a(p.(*InfoPane))
+		return true
+	}
+}
+
 type InfoPane struct {
 	*BufPane
 	*info.InfoBuf
@@ -22,6 +62,7 @@ func NewInfoPane(ib *info.InfoBuf, w display.BWindow, tab *Tab) *InfoPane {
 	ip := new(InfoPane)
 	ip.InfoBuf = ib
 	ip.BufPane = NewBufPane(ib.Buffer, w, tab)
+	ip.BufPane.bindings = InfoBufBindings
 
 	return ip
 }
@@ -42,7 +83,7 @@ func (h *InfoPane) HandleEvent(event tcell.Event) {
 	case *tcell.EventKey:
 		ke := KeyEvent{
 			code: e.Key(),
-			mod:  e.Modifiers(),
+			mod:  metaToAlt(e.Modifiers()),
 			r:    e.Rune(),
 		}
 
@@ -76,104 +117,43 @@ func (h *InfoPane) HandleEvent(event tcell.Event) {
 
 // DoKeyEvent executes a key event for the command bar, doing any overridden actions
 func (h *InfoPane) DoKeyEvent(e KeyEvent) bool {
-	done := false
-	if action, ok := BufKeyBindings[e]; ok {
-		estr := BufKeyStrings[e]
-		for _, s := range InfoNones {
-			if s == estr {
-				return false
-			}
-		}
-		for s, a := range InfoOverrides {
-			// TODO this is a hack and really we should have support
-			// for having binding overrides for different buffers
-			if strings.HasPrefix(estr, s) {
-				done = true
-				a(h)
-				break
-			}
-		}
-		if !done {
-			done = action(h.BufPane)
+	action, more := InfoBindings.NextEvent(e, nil)
+	if action != nil && !more {
+		action(h)
+		InfoBindings.ResetEvents()
+
+		return true
+	} else if action == nil && !more {
+		InfoBindings.ResetEvents()
+		// return false //TODO:?
+	}
+
+	if !more {
+		action, more = InfoBufBindings.NextEvent(e, nil)
+		if action != nil && !more {
+			done := action(h.BufPane)
+			InfoBufBindings.ResetEvents()
+			return done
+		} else if action == nil && !more {
+			InfoBufBindings.ResetEvents()
 		}
 	}
-	return done
+
+	return more
 }
 
-// InfoNones is a list of actions that should have no effect when executed
-// by an infohandler
-var InfoNones = []string{
-	"Save",
-	"SaveAll",
-	"SaveAs",
-	"Find",
-	"FindNext",
-	"FindPrevious",
-	"Center",
-	"DuplicateLine",
-	"MoveLinesUp",
-	"MoveLinesDown",
-	"OpenFile",
-	"Start",
-	"End",
-	"PageUp",
-	"PageDown",
-	"SelectPageUp",
-	"SelectPageDown",
-	"HalfPageUp",
-	"HalfPageDown",
-	"ToggleHelp",
-	"ToggleKeyMenu",
-	"ToggleDiffGutter",
-	"ToggleRuler",
-	"JumpLine",
-	"ClearStatus",
-	"ShellMode",
-	"CommandMode",
-	"AddTab",
-	"PreviousTab",
-	"NextTab",
-	"NextSplit",
-	"PreviousSplit",
-	"Unsplit",
-	"VSplit",
-	"HSplit",
-	"ToggleMacro",
-	"PlayMacro",
-	"Suspend",
-	"ScrollUp",
-	"ScrollDown",
-	"SpawnMultiCursor",
-	"SpawnMultiCursorSelect",
-	"RemoveMultiCursor",
-	"RemoveAllMultiCursors",
-	"SkipMultiCursor",
-}
-
-// InfoOverrides is the list of actions which have been overridden
-// by the infohandler
-var InfoOverrides = map[string]InfoKeyAction{
-	"CursorUp":      (*InfoPane).CursorUp,
-	"CursorDown":    (*InfoPane).CursorDown,
-	"InsertNewline": (*InfoPane).InsertNewline,
-	"Autocomplete":  (*InfoPane).Autocomplete,
-	"Escape":        (*InfoPane).Escape,
-	"Quit":          (*InfoPane).Quit,
-	"QuitAll":       (*InfoPane).QuitAll,
-}
-
-// CursorUp cycles history up
-func (h *InfoPane) CursorUp() {
+// HistoryUp cycles history up
+func (h *InfoPane) HistoryUp() {
 	h.UpHistory(h.History[h.PromptType])
 }
 
-// CursorDown cycles history down
-func (h *InfoPane) CursorDown() {
+// HistoryDown cycles history down
+func (h *InfoPane) HistoryDown() {
 	h.DownHistory(h.History[h.PromptType])
 }
 
 // Autocomplete begins autocompletion
-func (h *InfoPane) Autocomplete() {
+func (h *InfoPane) CommandComplete() {
 	b := h.Buf
 	if b.HasSuggestions {
 		b.CycleAutocomplete(true)
@@ -201,24 +181,23 @@ func (h *InfoPane) Autocomplete() {
 	}
 }
 
-// InsertNewline completes the prompt
-func (h *InfoPane) InsertNewline() {
+// ExecuteCommand completes the prompt
+func (h *InfoPane) ExecuteCommand() {
 	if !h.HasYN {
 		h.DonePrompt(false)
 	}
 }
 
-// Quit cancels the prompt
-func (h *InfoPane) Quit() {
+// AbortCommand cancels the prompt
+func (h *InfoPane) AbortCommand() {
 	h.DonePrompt(true)
 }
 
-// QuitAll cancels the prompt
-func (h *InfoPane) QuitAll() {
-	h.DonePrompt(true)
-}
-
-// Escape cancels the prompt
-func (h *InfoPane) Escape() {
-	h.DonePrompt(true)
+// InfoKeyActions contains the list of all possible key actions the infopane could execute
+var InfoKeyActions = map[string]InfoKeyAction{
+	"HistoryUp":       (*InfoPane).HistoryUp,
+	"HistoryDown":     (*InfoPane).HistoryDown,
+	"CommandComplete": (*InfoPane).CommandComplete,
+	"ExecuteCommand":  (*InfoPane).ExecuteCommand,
+	"AbortCommand":    (*InfoPane).AbortCommand,
 }

internal/action/keytree.go

@@ -0,0 +1,261 @@
+package action
+
+import (
+	"bytes"
+
+	"github.com/zyedidia/tcell/v2"
+)
+
+type PaneKeyAction func(Pane) bool
+type PaneMouseAction func(Pane, *tcell.EventMouse) bool
+type PaneKeyAnyAction func(Pane, []KeyEvent) bool
+
+// A KeyTreeNode stores a single node in the KeyTree (trie). The
+// children are stored as a map, and any node may store a list of
+// actions (the list will be nil if no actions correspond to a certain
+// node)
+type KeyTreeNode struct {
+	children map[Event]*KeyTreeNode
+
+	// Only one of these actions may be active in the current
+	// mode, and only one will be returned. If multiple actions
+	// are active, it is undefined which one will be the one
+	// returned.
+	actions []TreeAction
+}
+
+func NewKeyTreeNode() *KeyTreeNode {
+	n := new(KeyTreeNode)
+	n.children = make(map[Event]*KeyTreeNode)
+	n.actions = []TreeAction{}
+	return n
+}
+
+// A TreeAction stores an action, and a set of mode constraints for
+// the action to be active.
+type TreeAction struct {
+	// only one of these can be non-nil
+	action PaneKeyAction
+	any    PaneKeyAnyAction
+	mouse  PaneMouseAction
+
+	modes []ModeConstraint
+}
+
+// A KeyTree is a data structure for storing keybindings. It maps
+// key events to actions, and maintains a set of currently enabled
+// modes, which affects the action that is returned for a key event.
+// The tree acts like a Trie for Events to handle sequence events.
+type KeyTree struct {
+	root  *KeyTreeNode
+	modes map[string]bool
+
+	cursor KeyTreeCursor
+}
+
+// A KeyTreeCursor keeps track of the current location within the
+// tree, and stores any information from previous events that may
+// be needed to execute the action (values of wildcard events or
+// mouse events)
+type KeyTreeCursor struct {
+	node *KeyTreeNode
+
+	recordedEvents []Event
+	wildcards      []KeyEvent
+	mouseInfo      *tcell.EventMouse
+}
+
+// MakeClosure uses the information stored in a key tree cursor to construct
+// a PaneKeyAction from a TreeAction (which may have a PaneKeyAction, PaneMouseAction,
+// or AnyAction)
+func (k *KeyTreeCursor) MakeClosure(a TreeAction) PaneKeyAction {
+	if a.action != nil {
+		return a.action
+	} else if a.any != nil {
+		return func(p Pane) bool {
+			return a.any(p, k.wildcards)
+		}
+	} else if a.mouse != nil {
+		return func(p Pane) bool {
+			return a.mouse(p, k.mouseInfo)
+		}
+	}
+
+	return nil
+}
+
+// NewKeyTree allocates and returns an empty key tree
+func NewKeyTree() *KeyTree {
+	root := NewKeyTreeNode()
+	tree := new(KeyTree)
+
+	tree.root = root
+	tree.modes = make(map[string]bool)
+	tree.cursor = KeyTreeCursor{
+		node:      root,
+		wildcards: []KeyEvent{},
+		mouseInfo: nil,
+	}
+
+	return tree
+}
+
+// A ModeConstraint specifies that an action can only be executed
+// while a certain mode is enabled or disabled.
+type ModeConstraint struct {
+	mode     string
+	disabled bool
+}
+
+// RegisterKeyBinding registers a PaneKeyAction with an Event.
+func (k *KeyTree) RegisterKeyBinding(e Event, a PaneKeyAction) {
+	k.registerBinding(e, TreeAction{
+		action: a,
+		any:    nil,
+		mouse:  nil,
+		modes:  nil,
+	})
+}
+
+// RegisterKeyAnyBinding registers a PaneKeyAnyAction with an Event.
+// The event should contain an "any" event.
+func (k *KeyTree) RegisterKeyAnyBinding(e Event, a PaneKeyAnyAction) {
+	k.registerBinding(e, TreeAction{
+		action: nil,
+		any:    a,
+		mouse:  nil,
+		modes:  nil,
+	})
+}
+
+// RegisterMouseBinding registers a PaneMouseAction with an Event.
+// The event should contain a mouse event.
+func (k *KeyTree) RegisterMouseBinding(e Event, a PaneMouseAction) {
+	k.registerBinding(e, TreeAction{
+		action: nil,
+		any:    nil,
+		mouse:  a,
+		modes:  nil,
+	})
+}
+
+func (k *KeyTree) registerBinding(e Event, a TreeAction) {
+	switch ev := e.(type) {
+	case KeyEvent, MouseEvent, RawEvent:
+		newNode, ok := k.root.children[e]
+		if !ok {
+			newNode = NewKeyTreeNode()
+			k.root.children[e] = newNode
+		}
+		// newNode.actions = append(newNode.actions, a)
+		newNode.actions = []TreeAction{a}
+	case KeySequenceEvent:
+		n := k.root
+		for _, key := range ev.keys {
+			newNode, ok := n.children[key]
+			if !ok {
+				newNode = NewKeyTreeNode()
+				n.children[key] = newNode
+			}
+
+			n = newNode
+		}
+		// n.actions = append(n.actions, a)
+		n.actions = []TreeAction{a}
+	}
+}
+
+// NextEvent returns the action for the current sequence where e is the next
+// event. Even if the action was registered as a PaneKeyAnyAction or PaneMouseAction,
+// it will be returned as a PaneKeyAction closure where the appropriate arguments
+// have been provided.
+// If no action is associated with the given Event, or mode constraints are not
+// met for that action, nil is returned.
+// A boolean is returned to indicate if there is a conflict with this action. A
+// conflict occurs when there is an active action for this event but there are
+// bindings associated with further sequences starting with this event. The
+// calling function can decide what to do about the conflict (e.g. use a
+// timeout).
+func (k *KeyTree) NextEvent(e Event, mouse *tcell.EventMouse) (PaneKeyAction, bool) {
+	n := k.cursor.node
+	c, ok := n.children[e]
+
+	if !ok {
+		return nil, false
+	}
+
+	more := len(c.children) > 0
+
+	k.cursor.node = c
+
+	k.cursor.recordedEvents = append(k.cursor.recordedEvents, e)
+
+	switch ev := e.(type) {
+	case KeyEvent:
+		if ev.any {
+			k.cursor.wildcards = append(k.cursor.wildcards, ev)
+		}
+	case MouseEvent:
+		k.cursor.mouseInfo = mouse
+	}
+
+	if len(c.actions) > 0 {
+		// check if actions are active
+		for _, a := range c.actions {
+			active := true
+			for _, mc := range a.modes {
+				// if any mode constraint is not met, the action is not active
+				hasMode := k.modes[mc.mode]
+				if hasMode != mc.disabled {
+					active = false
+				}
+			}
+
+			if active {
+				// the first active action to be found is returned
+				return k.cursor.MakeClosure(a), more
+			}
+		}
+	}
+
+	return nil, more
+}
+
+// ResetEvents sets the current sequence back to the initial value.
+func (k *KeyTree) ResetEvents() {
+	k.cursor.node = k.root
+	k.cursor.wildcards = []KeyEvent{}
+	k.cursor.recordedEvents = []Event{}
+	k.cursor.mouseInfo = nil
+}
+
+// CurrentEventsStr returns the list of recorded events as a string
+func (k *KeyTree) RecordedEventsStr() string {
+	buf := &bytes.Buffer{}
+	for _, e := range k.cursor.recordedEvents {
+		buf.WriteString(e.Name())
+	}
+	return buf.String()
+}
+
+// DeleteBinding removes any currently active actions associated with the
+// given event.
+func (k *KeyTree) DeleteBinding(e Event) {
+
+}
+
+// DeleteAllBindings removes all actions associated with the given event,
+// regardless of whether they are active or not.
+func (k *KeyTree) DeleteAllBindings(e Event) {
+
+}
+
+// SetMode enables or disabled a given mode
+func (k *KeyTree) SetMode(mode string, en bool) {
+	k.modes[mode] = en
+}
+
+// HasMode returns if the given mode is currently active
+func (k *KeyTree) HasMode(mode string) bool {
+	return k.modes[mode]
+}

internal/action/rawpane.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/zyedidia/micro/v2/internal/buffer"
 	"github.com/zyedidia/micro/v2/internal/display"
-	"github.com/zyedidia/tcell"
+	"github.com/zyedidia/tcell/v2"
 )
 
 type RawPane struct {
@@ -35,6 +35,13 @@ func (h *RawPane) HandleEvent(event tcell.Event) {
 	}
 
 	h.Buf.Insert(h.Cursor.Loc, reflect.TypeOf(event).String()[7:])
+
+	e, err := ConstructEvent(event)
+	if err == nil {
+		h.Buf.Insert(h.Cursor.Loc, fmt.Sprintf(": %s", e.Name()))
+	}
+
 	h.Buf.Insert(h.Cursor.Loc, fmt.Sprintf(": %q\n", event.EscSeq()))
+
 	h.Relocate()
 }

internal/action/tab.go

@@ -6,7 +6,7 @@ import (
 	"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"
+	"github.com/zyedidia/tcell/v2"
 )
 
 // The TabList is a list of tabs and a window to display the tab bar
@@ -175,6 +175,7 @@ func NewTabFromBuffer(x, y, width, height int, b *buffer.Buffer) *Tab {
 	t := new(Tab)
 	t.Node = views.NewRoot(x, y, width, height)
 	t.UIWindow = display.NewUIWindow(t.Node)
+	t.release = true
 
 	e := NewBufPaneFromBuf(b, t)
 	e.SetID(t.ID())
@@ -187,6 +188,7 @@ func NewTabFromPane(x, y, width, height int, pane Pane) *Tab {
 	t := new(Tab)
 	t.Node = views.NewRoot(x, y, width, height)
 	t.UIWindow = display.NewUIWindow(t.Node)
+	t.release = true
 	pane.SetTab(t)
 	pane.SetID(t.ID())
 
@@ -220,9 +222,8 @@ func (t *Tab) HandleEvent(event tcell.Event) {
 			}
 
 			if wasReleased {
-				resizeID := t.GetMouseSplitID(buffer.Loc{mx, my})
-				if resizeID != 0 {
-					t.resizing = t.GetNode(uint64(resizeID))
+				t.resizing = t.GetMouseSplitNode(buffer.Loc{mx, my})
+				if t.resizing != nil {
 					return
 				}
 

internal/action/terminal_supported.go

@@ -24,7 +24,10 @@ func RunTermEmulator(h *BufPane, input string, wait bool, getOutput bool, callba
 	}
 
 	t := new(shell.Terminal)
-	t.Start(args, getOutput, wait, callback, userargs)
+	err = t.Start(args, getOutput, wait, callback, userargs)
+	if err != nil {
+		return err
+	}
 
 	h.AddTab()
 	id := MainTab().Panes[0].ID()

internal/action/termpane.go

@@ -4,14 +4,49 @@ import (
 	"errors"
 	"runtime"
 
-	"github.com/zyedidia/clipboard"
+	"github.com/zyedidia/micro/v2/internal/clipboard"
 	"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/tcell/v2"
 	"github.com/zyedidia/terminal"
 )
 
+type TermKeyAction func(*TermPane)
+
+var TermBindings *KeyTree
+
+func init() {
+	TermBindings = NewKeyTree()
+}
+
+func TermKeyActionGeneral(a TermKeyAction) PaneKeyAction {
+	return func(p Pane) bool {
+		a(p.(*TermPane))
+		return true
+	}
+}
+
+func TermMapEvent(k Event, action string) {
+	switch e := k.(type) {
+	case KeyEvent, KeySequenceEvent, RawEvent:
+		termMapKey(e, action)
+	case MouseEvent:
+		termMapMouse(e, action)
+	}
+}
+
+func termMapKey(k Event, action string) {
+	if f, ok := TermKeyActions[action]; ok {
+		TermBindings.RegisterKeyBinding(k, TermKeyActionGeneral(f))
+	}
+}
+
+func termMapMouse(k MouseEvent, action string) {
+	// TODO: map mouse
+	termMapKey(k, action)
+}
+
 type TermPane struct {
 	*shell.Terminal
 	display.Window
@@ -53,6 +88,7 @@ func (t *TermPane) Tab() *Tab {
 
 func (t *TermPane) Close() {}
 
+// Quit closes this termpane
 func (t *TermPane) Quit() {
 	t.Close()
 	if len(MainTab().Panes) > 1 {
@@ -66,6 +102,7 @@ func (t *TermPane) Quit() {
 	}
 }
 
+// Unsplit removes this split
 func (t *TermPane) Unsplit() {
 	n := MainTab().GetNode(t.id)
 	n.Unsplit()
@@ -81,6 +118,26 @@ func (t *TermPane) Unsplit() {
 // copy-paste
 func (t *TermPane) HandleEvent(event tcell.Event) {
 	if e, ok := event.(*tcell.EventKey); ok {
+		ke := KeyEvent{
+			code: e.Key(),
+			mod:  metaToAlt(e.Modifiers()),
+			r:    e.Rune(),
+		}
+		action, more := TermBindings.NextEvent(ke, nil)
+
+		if !more {
+			if action != nil {
+				action(t)
+				TermBindings.ResetEvents()
+				return
+			}
+			TermBindings.ResetEvents()
+		}
+
+		if more {
+			return
+		}
+
 		if t.Status == shell.TTDone {
 			switch e.Key() {
 			case tcell.KeyEscape, tcell.KeyCtrlQ, tcell.KeyEnter:
@@ -90,7 +147,7 @@ func (t *TermPane) HandleEvent(event tcell.Event) {
 			}
 		}
 		if e.Key() == tcell.KeyCtrlC && t.HasSelection() {
-			clipboard.WriteAll(t.GetSelection(t.GetView().Width), "clipboard")
+			clipboard.Write(t.GetSelection(t.GetView().Width), clipboard.ClipboardReg)
 			InfoBar.Message("Copied selection to clipboard")
 		} else if t.Status != shell.TTDone {
 			t.WriteString(event.EscSeq())
@@ -134,6 +191,41 @@ func (t *TermPane) HandleEvent(event tcell.Event) {
 	}
 }
 
+// Exit closes the termpane
+func (t *TermPane) Exit() {
+	t.Terminal.Close()
+	t.Quit()
+}
+
+// CommandMode opens the termpane's command mode
+func (t *TermPane) CommandMode() {
+	InfoBar.Prompt("> ", "", "TerminalCommand", nil, func(resp string, canceled bool) {
+		if !canceled {
+			t.HandleCommand(resp)
+		}
+	})
+}
+
+// NextSplit moves to the next split
+func (t *TermPane) NextSplit() {
+	a := t.tab.active
+	if a < len(t.tab.Panes)-1 {
+		a++
+	} else {
+		a = 0
+	}
+
+	t.tab.SetActive(a)
+}
+
+// HandleCommand handles a command for the term pane
 func (t *TermPane) HandleCommand(input string) {
 	InfoBar.Error("Commands are unsupported in term for now")
 }
+
+// TermKeyActions contains the list of all possible key actions the termpane could execute
+var TermKeyActions = map[string]TermKeyAction{
+	"Exit":        (*TermPane).Exit,
+	"CommandMode": (*TermPane).CommandMode,
+	"NextSplit":   (*TermPane).NextSplit,
+}

internal/buffer/autocomplete.go

@@ -54,8 +54,6 @@ func (b *Buffer) CycleAutocomplete(forward bool) {
 	end := c.Loc
 	if prevSuggestion < len(b.Suggestions) && prevSuggestion >= 0 {
 		start = end.Move(-util.CharacterCountInString(b.Completions[prevSuggestion]), b)
-	} else {
-		// end = start.Move(1, b)
 	}
 
 	b.Replace(start, end, b.Completions[b.CurSuggestion])

internal/buffer/backup.go

@@ -5,6 +5,7 @@ import (
 	"io"
 	"os"
 	"path/filepath"
+	"sync/atomic"
 	"time"
 
 	"github.com/zyedidia/micro/v2/internal/config"
@@ -28,29 +29,56 @@ The backup was created on %s, and the file is
 
 Options: [r]ecover, [i]gnore: `
 
+var backupRequestChan chan *Buffer
+
+func backupThread() {
+	for {
+		time.Sleep(time.Second * 8)
+
+		for len(backupRequestChan) > 0 {
+			b := <-backupRequestChan
+			bfini := atomic.LoadInt32(&(b.fini)) != 0
+			if !bfini {
+				b.Backup()
+			}
+		}
+	}
+}
+
+func init() {
+	backupRequestChan = make(chan *Buffer, 10)
+
+	go backupThread()
+}
+
+func (b *Buffer) RequestBackup() {
+	if !b.requestedBackup {
+		select {
+		case backupRequestChan <- b:
+		default:
+			// channel is full
+		}
+		b.requestedBackup = true
+	}
+}
+
 // Backup saves the current buffer to ConfigDir/backups
-func (b *Buffer) Backup(checkTime bool) error {
+func (b *Buffer) Backup() error {
 	if !b.Settings["backup"].(bool) || b.Path == "" || b.Type != BTDefault {
 		return nil
 	}
 
-	if checkTime {
-		sub := time.Now().Sub(b.lastbackup)
-		if sub < time.Duration(backupTime)*time.Millisecond {
-			return nil
-		}
+	backupdir, err := util.ReplaceHome(b.Settings["backupdir"].(string))
+	if backupdir == "" || err != nil {
+		backupdir = filepath.Join(config.ConfigDir, "backups")
 	}
-
-	b.lastbackup = time.Now()
-
-	backupdir := filepath.Join(config.ConfigDir, "backups")
 	if _, err := os.Stat(backupdir); os.IsNotExist(err) {
 		os.Mkdir(backupdir, os.ModePerm)
 	}
 
 	name := filepath.Join(backupdir, util.EscapePath(b.AbsPath))
 
-	err := overwriteFile(name, encoding.Nop, func(file io.Writer) (e error) {
+	err = overwriteFile(name, encoding.Nop, func(file io.Writer) (e error) {
 		if len(b.lines) == 0 {
 			return
 		}
@@ -74,12 +102,14 @@ func (b *Buffer) Backup(checkTime bool) error {
 		return
 	}, false)
 
+	b.requestedBackup = false
+
 	return err
 }
 
 // RemoveBackup removes any backup file associated with this buffer
 func (b *Buffer) RemoveBackup() {
-	if !b.Settings["backup"].(bool) || b.Path == "" || b.Type != BTDefault {
+	if !b.Settings["backup"].(bool) || b.Settings["permbackup"].(bool) || b.Path == "" || b.Type != BTDefault {
 		return
 	}
 	f := filepath.Join(config.ConfigDir, "backups", util.EscapePath(b.AbsPath))
@@ -89,7 +119,7 @@ func (b *Buffer) RemoveBackup() {
 // ApplyBackup applies the corresponding backup file to this buffer (if one exists)
 // Returns true if a backup was applied
 func (b *Buffer) ApplyBackup(fsize int64) bool {
-	if b.Settings["backup"].(bool) && len(b.Path) > 0 && b.Type == BTDefault {
+	if b.Settings["backup"].(bool) && !b.Settings["permbackup"].(bool) && len(b.Path) > 0 && b.Type == BTDefault {
 		backupfile := filepath.Join(config.ConfigDir, "backups", util.EscapePath(b.AbsPath))
 		if info, err := os.Stat(backupfile); err == nil {
 			backup, err := os.Open(backupfile)

internal/buffer/buffer.go

@@ -14,6 +14,7 @@ import (
 	"strconv"
 	"strings"
 	"sync"
+	"sync/atomic"
 	"time"
 
 	luar "layeh.com/gopher-luar"
@@ -102,9 +103,7 @@ type SharedBuffer struct {
 	diffLock          sync.RWMutex
 	diff              map[int]DiffStatus
 
-	// counts the number of edits
-	// resets every backupTime edits
-	lastbackup time.Time
+	requestedBackup bool
 
 	// ReloadDisabled allows the user to disable reloads if they
 	// are viewing a file that is constantly changing
@@ -186,18 +185,28 @@ type Buffer struct {
 	*EventHandler
 	*SharedBuffer
 
+	fini        int32
 	cursors     []*Cursor
 	curCursor   int
 	StartCursor Loc
 }
 
-// NewBufferFromFile opens a new buffer using the given path
-// It will also automatically handle `~`, and line/column with filename:l:c
-// It will return an empty buffer if the path does not exist
-// and an error if the file is a directory
-func NewBufferFromFile(path string, btype BufType) (*Buffer, error) {
+// NewBufferFromFileAtLoc opens a new buffer with a given cursor location
+// If cursorLoc is {-1, -1} the location does not overwrite what the cursor location
+// would otherwise be (start of file, or saved cursor position if `savecursor` is
+// enabled)
+func NewBufferFromFileAtLoc(path string, btype BufType, cursorLoc Loc) (*Buffer, error) {
 	var err error
-	filename, cursorPos := util.GetPathAndCursorPosition(path)
+	filename := path
+	if config.GetGlobalOption("parsecursor").(bool) && cursorLoc.X == -1 && cursorLoc.Y == -1 {
+		var cursorPos []string
+		filename, cursorPos = util.GetPathAndCursorPosition(filename)
+		cursorLoc, err = ParseCursorLocation(cursorPos)
+		if err != nil {
+			cursorLoc = Loc{-1, -1}
+		}
+	}
+
 	filename, err = util.ReplaceHome(filename)
 	if err != nil {
 		return nil, err
@@ -212,11 +221,6 @@ func NewBufferFromFile(path string, btype BufType) (*Buffer, error) {
 
 	defer file.Close()
 
-	cursorLoc, cursorerr := ParseCursorLocation(cursorPos)
-	if cursorerr != nil {
-		cursorLoc = Loc{-1, -1}
-	}
-
 	var buf *Buffer
 	if err != nil {
 		// File does not exist -- create an empty buffer with that name
@@ -228,6 +232,19 @@ func NewBufferFromFile(path string, btype BufType) (*Buffer, error) {
 	return buf, nil
 }
 
+// NewBufferFromFile opens a new buffer using the given path
+// It will also automatically handle `~`, and line/column with filename:l:c
+// It will return an empty buffer if the path does not exist
+// and an error if the file is a directory
+func NewBufferFromFile(path string, btype BufType) (*Buffer, error) {
+	return NewBufferFromFileAtLoc(path, btype, Loc{-1, -1})
+}
+
+// NewBufferFromStringAtLoc creates a new buffer containing the given string with a cursor loc
+func NewBufferFromStringAtLoc(text, path string, btype BufType, cursorLoc Loc) *Buffer {
+	return NewBuffer(strings.NewReader(text), int64(len(text)), path, cursorLoc, btype)
+}
+
 // NewBufferFromString creates a new buffer containing the given string
 func NewBufferFromString(text, path string, btype BufType) *Buffer {
 	return NewBuffer(strings.NewReader(text), int64(len(text)), path, Loc{-1, -1}, btype)
@@ -254,6 +271,7 @@ func NewBuffer(r io.Reader, size int64, path string, startcursor Loc, btype BufT
 		}
 	}
 
+	hasBackup := false
 	if !found {
 		b.SharedBuffer = new(SharedBuffer)
 		b.Type = btype
@@ -276,11 +294,25 @@ func NewBuffer(r io.Reader, size int64, path string, startcursor Loc, btype BufT
 			b.Settings["encoding"] = "utf-8"
 		}
 
-		hasBackup := b.ApplyBackup(size)
+		hasBackup = b.ApplyBackup(size)
 
 		if !hasBackup {
 			reader := bufio.NewReader(transform.NewReader(r, enc.NewDecoder()))
-			b.LineArray = NewLineArray(uint64(size), FFAuto, reader)
+
+			var ff FileFormat = FFAuto
+
+			if size == 0 {
+				// for empty files, use the fileformat setting instead of
+				// autodetection
+				switch b.Settings["fileformat"] {
+				case "unix":
+					ff = FFUnix
+				case "dos":
+					ff = FFDos
+				}
+			}
+
+			b.LineArray = NewLineArray(uint64(size), ff, reader)
 		}
 		b.EventHandler = NewEventHandler(b.SharedBuffer, b.cursors)
 
@@ -325,7 +357,9 @@ func NewBuffer(r io.Reader, size int64, path string, startcursor Loc, btype BufT
 		if size > LargeFileThreshold {
 			// If the file is larger than LargeFileThreshold fastdirty needs to be on
 			b.Settings["fastdirty"] = true
-		} else {
+		} else if !hasBackup {
+			// since applying a backup does not save the applied backup to disk, we should
+			// not calculate the original hash based on the backup data
 			calcHash(b, &b.origHash)
 		}
 	}
@@ -364,6 +398,8 @@ func (b *Buffer) Fini() {
 	if b.Type == BTStdout {
 		fmt.Fprint(util.Stdout, string(b.Bytes()))
 	}
+
+	atomic.StoreInt32(&(b.fini), int32(1))
 }
 
 // GetName returns the name that should be displayed in the statusline
@@ -394,7 +430,7 @@ func (b *Buffer) Insert(start Loc, text string) {
 		b.EventHandler.active = b.curCursor
 		b.EventHandler.Insert(start, text)
 
-		go b.Backup(true)
+		b.RequestBackup()
 	}
 }
 
@@ -405,7 +441,7 @@ func (b *Buffer) Remove(start, end Loc) {
 		b.EventHandler.active = b.curCursor
 		b.EventHandler.Remove(start, end)
 
-		go b.Backup(true)
+		b.RequestBackup()
 	}
 }
 
@@ -502,6 +538,22 @@ func (b *Buffer) Modified() bool {
 	return buff != b.origHash
 }
 
+// Size returns the number of bytes in the current buffer
+func (b *Buffer) Size() int {
+	nb := 0
+	for i := 0; i < b.LinesNum(); i++ {
+		nb += len(b.LineBytes(i))
+
+		if i != b.LinesNum()-1 {
+			if b.Endings == FFDos {
+				nb++ // carriage return
+			}
+			nb++ // newline
+		}
+	}
+	return nb
+}
+
 // calcHash calculates md5 hash of all lines in the buffer
 func calcHash(b *Buffer, out *[md5.Size]byte) error {
 	h := md5.New()
@@ -558,6 +610,9 @@ func (b *Buffer) UpdateRules() {
 		}
 
 		header, err = highlight.MakeHeaderYaml(data)
+		if err != nil {
+			screen.TermMessage("Error parsing header for syntax file " + f.Name() + ": " + err.Error())
+		}
 		file, err := highlight.ParseFile(data)
 		if err != nil {
 			screen.TermMessage("Error parsing syntax file " + f.Name() + ": " + err.Error())
@@ -806,19 +861,18 @@ func (b *Buffer) MoveLinesUp(start int, end int) {
 	}
 	l := string(b.LineBytes(start - 1))
 	if end == len(b.lines) {
-		b.Insert(
+		b.insert(
 			Loc{
 				util.CharacterCount(b.lines[end-1].data),
 				end - 1,
 			},
-			"\n"+l,
-		)
-	} else {
-		b.Insert(
-			Loc{0, end},
-			l+"\n",
+			[]byte{'\n'},
 		)
 	}
+	b.Insert(
+		Loc{0, end},
+		l+"\n",
+	)
 	b.Remove(
 		Loc{0, start - 1},
 		Loc{0, start},
@@ -827,7 +881,7 @@ func (b *Buffer) MoveLinesUp(start int, end int) {
 
 // MoveLinesDown moves the range of lines down one row
 func (b *Buffer) MoveLinesDown(start int, end int) {
-	if start < 0 || start >= end || end >= len(b.lines)-1 {
+	if start < 0 || start >= end || end >= len(b.lines) {
 		return
 	}
 	l := string(b.LineBytes(end))

internal/buffer/cursor.go

@@ -1,7 +1,7 @@
 package buffer
 
 import (
-	"github.com/zyedidia/clipboard"
+	"github.com/zyedidia/micro/v2/internal/clipboard"
 	"github.com/zyedidia/micro/v2/internal/util"
 )
 
@@ -74,9 +74,6 @@ func (c *Cursor) GetVisualX() int {
 
 	bytes := c.buf.LineBytes(c.Y)
 	tabsize := int(c.buf.Settings["tabsize"].(float64))
-	if c.X > util.CharacterCount(bytes) {
-		c.X = util.CharacterCount(bytes) - 1
-	}
 
 	return util.StringWidth(bytes, c.X, tabsize)
 }
@@ -128,10 +125,10 @@ func (c *Cursor) End() {
 
 // CopySelection copies the user's selection to either "primary"
 // or "clipboard"
-func (c *Cursor) CopySelection(target string) {
+func (c *Cursor) CopySelection(target clipboard.Register) {
 	if c.HasSelection() {
-		if target != "primary" || c.buf.Settings["useprimary"].(bool) {
-			clipboard.WriteAll(string(c.GetSelection()), target)
+		if target != clipboard.PrimaryReg || c.buf.Settings["useprimary"].(bool) {
+			clipboard.WriteMulti(string(c.GetSelection()), target, c.Num, c.buf.NumCursors())
 		}
 	}
 }
@@ -242,6 +239,12 @@ func (c *Cursor) UpN(amount int) {
 
 	if c.X > util.CharacterCount(bytes) || (amount < 0 && proposedY == c.Y) {
 		c.X = util.CharacterCount(bytes)
+		c.StoreVisualX()
+	}
+
+	if c.X < 0 || (amount > 0 && proposedY == c.Y) {
+		c.X = 0
+		c.StoreVisualX()
 	}
 
 	c.Y = proposedY

internal/buffer/line_array.go

@@ -87,6 +87,8 @@ func NewLineArray(size uint64, endings FileFormat, reader io.Reader) *LineArray
 	br := bufio.NewReader(reader)
 	var loaded int
 
+	la.Endings = endings
+
 	n := 0
 	for {
 		data, err := br.ReadBytes('\n')
@@ -128,7 +130,7 @@ func NewLineArray(size uint64, endings FileFormat, reader io.Reader) *LineArray
 		if err != nil {
 			if err == io.EOF {
 				la.lines = Append(la.lines, Line{
-					data:        data[:],
+					data:        data,
 					state:       nil,
 					match:       nil,
 					rehighlight: false,
@@ -189,10 +191,15 @@ func (la *LineArray) newlineBelow(y int) {
 func (la *LineArray) insert(pos Loc, value []byte) {
 	x, y := runeToByteIndex(pos.X, la.lines[pos.Y].data), pos.Y
 	for i := 0; i < len(value); i++ {
-		if value[i] == '\n' {
+		if value[i] == '\n' || (value[i] == '\r' && i < len(value)-1 && value[i+1] == '\n') {
 			la.split(Loc{x, y})
 			x = 0
 			y++
+
+			if value[i] == '\r' {
+				i++
+			}
+
 			continue
 		}
 		la.insertByte(Loc{x, y}, value[i])

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))

internal/buffer/message.go

@@ -2,7 +2,7 @@ package buffer
 
 import (
 	"github.com/zyedidia/micro/v2/internal/config"
-	"github.com/zyedidia/tcell"
+	"github.com/zyedidia/tcell/v2"
 )
 
 type MsgType int

internal/buffer/save.go

@@ -96,7 +96,6 @@ func (b *Buffer) saveToFile(filename string, withSudo bool) error {
 		return errors.New("Save with sudo not supported on Windows")
 	}
 
-	b.UpdateRules()
 	if b.Settings["rmtrailingws"].(bool) {
 		for i, l := range b.lines {
 			leftover := util.CharacterCount(bytes.TrimRightFunc(l.data, unicode.IsSpace))
@@ -195,5 +194,6 @@ func (b *Buffer) saveToFile(filename string, withSudo bool) error {
 	absPath, _ := filepath.Abs(filename)
 	b.AbsPath = absPath
 	b.isModified = false
+	b.UpdateRules()
 	return err
 }

internal/buffer/search.go

@@ -7,6 +7,13 @@ import (
 )
 
 func (b *Buffer) findDown(r *regexp.Regexp, start, end Loc) ([2]Loc, bool) {
+	lastcn := util.CharacterCount(b.LineBytes(b.LinesNum() - 1))
+	if start.Y > b.LinesNum()-1 {
+		start.X = lastcn - 1
+	}
+	if end.Y > b.LinesNum()-1 {
+		end.X = lastcn
+	}
 	start.Y = util.Clamp(start.Y, 0, b.LinesNum()-1)
 	end.Y = util.Clamp(end.Y, 0, b.LinesNum()-1)
 
@@ -48,6 +55,13 @@ func (b *Buffer) findDown(r *regexp.Regexp, start, end Loc) ([2]Loc, bool) {
 }
 
 func (b *Buffer) findUp(r *regexp.Regexp, start, end Loc) ([2]Loc, bool) {
+	lastcn := util.CharacterCount(b.LineBytes(b.LinesNum() - 1))
+	if start.Y > b.LinesNum()-1 {
+		start.X = lastcn - 1
+	}
+	if end.Y > b.LinesNum()-1 {
+		end.X = lastcn
+	}
 	start.Y = util.Clamp(start.Y, 0, b.LinesNum()-1)
 	end.Y = util.Clamp(end.Y, 0, b.LinesNum()-1)
 
@@ -132,7 +146,7 @@ func (b *Buffer) FindNext(s string, start, end, from Loc, down bool, useRegex bo
 
 // ReplaceRegex replaces all occurrences of 'search' with 'replace' in the given area
 // and returns the number of replacements made and the number of runes
-// added or removed
+// added or removed on the last line of the range
 func (b *Buffer) ReplaceRegex(start, end Loc, search *regexp.Regexp, replace []byte) (int, int) {
 	if start.GreaterThan(end) {
 		start, end = end, start
@@ -162,7 +176,9 @@ func (b *Buffer) ReplaceRegex(start, end Loc, search *regexp.Regexp, replace []b
 				result = search.Expand(result, replace, in, submatches)
 			}
 			found++
-			netrunes += util.CharacterCount(in) - util.CharacterCount(result)
+			if i == end.Y {
+				netrunes += util.CharacterCount(result) - util.CharacterCount(in)
+			}
 			return result
 		})
 

internal/buffer/serialize.go

@@ -51,8 +51,8 @@ func (b *Buffer) Unserialize() error {
 		return nil
 	}
 	file, err := os.Open(filepath.Join(config.ConfigDir, "buffers", util.EscapePath(b.AbsPath)))
-	defer file.Close()
 	if err == nil {
+		defer file.Close()
 		var buffer SerializedBuffer
 		decoder := gob.NewDecoder(file)
 		err = decoder.Decode(&buffer)

internal/buffer/settings.go

@@ -10,9 +10,11 @@ func (b *Buffer) SetOptionNative(option string, nativeValue interface{}) error {
 
 	if option == "fastdirty" {
 		if !nativeValue.(bool) {
-			e := calcHash(b, &b.origHash)
-			if e == ErrFileTooLarge {
-				b.Settings["fastdirty"] = false
+			if !b.Modified() {
+				e := calcHash(b, &b.origHash)
+				if e == ErrFileTooLarge {
+					b.Settings["fastdirty"] = false
+				}
 			}
 		}
 	} else if option == "statusline" {

internal/clipboard/clipboard.go

@@ -0,0 +1,151 @@
+package clipboard
+
+import (
+	"errors"
+
+	"github.com/zyedidia/clipboard"
+)
+
+type Method int
+
+const (
+	// External relies on external tools for accessing the clipboard
+	// These include xclip, xsel, wl-clipboard for linux, pbcopy/pbpaste on Mac,
+	// and Syscalls on Windows.
+	External Method = iota
+	// Terminal uses the terminal to manage the clipboard via OSC 52. Many
+	// terminals do not support OSC 52, in which case this method won't work.
+	Terminal
+	// Internal just manages the clipboard with an internal buffer and doesn't
+	// attempt to interface with the system clipboard
+	Internal
+)
+
+// CurrentMethod is the method used to store clipboard information
+var CurrentMethod Method = Internal
+
+// A Register is a buffer used to store text. The system clipboard has the 'clipboard'
+// and 'primary' (linux-only) registers, but other registers may be used internal to micro.
+type Register int
+
+const (
+	// ClipboardReg is the main system clipboard
+	ClipboardReg Register = -1
+	// PrimaryReg is the system primary clipboard (linux only)
+	PrimaryReg = -2
+)
+
+// Initialize attempts to initialize the clipboard using the given method
+func Initialize(m Method) error {
+	var err error
+	switch m {
+	case External:
+		err = clipboard.Initialize()
+	}
+	return err
+}
+
+// SetMethod changes the clipboard access method
+func SetMethod(m string) Method {
+	switch m {
+	case "internal":
+		CurrentMethod = Internal
+	case "external":
+		CurrentMethod = External
+	case "terminal":
+		CurrentMethod = Terminal
+	}
+	return CurrentMethod
+}
+
+// Read reads from a clipboard register
+func Read(r Register) (string, error) {
+	return read(r, CurrentMethod)
+}
+
+// Write writes text to a clipboard register
+func Write(text string, r Register) error {
+	return write(text, r, CurrentMethod)
+}
+
+// ReadMulti reads text from a clipboard register for a certain multi-cursor
+func ReadMulti(r Register, num, ncursors int) (string, error) {
+	clip, err := Read(r)
+	if err != nil {
+		return "", err
+	}
+	if ValidMulti(r, clip, ncursors) {
+		return multi.getText(r, num), nil
+	}
+	return clip, nil
+}
+
+// WriteMulti writes text to a clipboard register for a certain multi-cursor
+func WriteMulti(text string, r Register, num int, ncursors int) error {
+	return writeMulti(text, r, num, ncursors, CurrentMethod)
+}
+
+// ValidMulti checks if the internal multi-clipboard is valid and up-to-date
+// with the system clipboard
+func ValidMulti(r Register, clip string, ncursors int) bool {
+	return multi.isValid(r, clip, ncursors)
+}
+
+func writeMulti(text string, r Register, num int, ncursors int, m Method) error {
+	multi.writeText(text, r, num, ncursors)
+	return write(multi.getAllText(r), r, m)
+}
+
+func read(r Register, m Method) (string, error) {
+	switch m {
+	case External:
+		switch r {
+		case ClipboardReg:
+			return clipboard.ReadAll("clipboard")
+		case PrimaryReg:
+			return clipboard.ReadAll("primary")
+		default:
+			return internal.read(r), nil
+		}
+	case Internal:
+		return internal.read(r), nil
+	case Terminal:
+		switch r {
+		case ClipboardReg:
+			// terminal paste works by sending an esc sequence to the
+			// terminal to trigger a paste event
+			return terminal.read("clipboard")
+		case PrimaryReg:
+			return terminal.read("primary")
+		default:
+			return internal.read(r), nil
+		}
+	}
+	return "", errors.New("Invalid clipboard method")
+}
+
+func write(text string, r Register, m Method) error {
+	switch m {
+	case External:
+		switch r {
+		case ClipboardReg:
+			return clipboard.WriteAll(text, "clipboard")
+		case PrimaryReg:
+			return clipboard.WriteAll(text, "primary")
+		default:
+			internal.write(text, r)
+		}
+	case Internal:
+		internal.write(text, r)
+	case Terminal:
+		switch r {
+		case ClipboardReg:
+			return terminal.write(text, "c")
+		case PrimaryReg:
+			return terminal.write(text, "p")
+		default:
+			internal.write(text, r)
+		}
+	}
+	return nil
+}

internal/clipboard/internal.go

@@ -0,0 +1,17 @@
+package clipboard
+
+type internalClipboard map[Register]string
+
+var internal internalClipboard
+
+func init() {
+	internal = make(internalClipboard)
+}
+
+func (c internalClipboard) read(r Register) string {
+	return c[r]
+}
+
+func (c internalClipboard) write(text string, r Register) {
+	c[r] = text
+}

internal/clipboard/multi.go

@@ -0,0 +1,63 @@
+package clipboard
+
+import (
+	"bytes"
+)
+
+// For storing multi cursor clipboard contents
+type multiClipboard map[Register][]string
+
+var multi multiClipboard
+
+func (c multiClipboard) getAllText(r Register) string {
+	content := c[r]
+	if content == nil {
+		return ""
+	}
+
+	buf := &bytes.Buffer{}
+	for _, s := range content {
+		buf.WriteString(s)
+	}
+	return buf.String()
+}
+
+func (c multiClipboard) getText(r Register, num int) string {
+	content := c[r]
+	if content == nil || len(content) <= num {
+		return ""
+	}
+
+	return content[num]
+}
+
+// isValid checks if the text stored in this multi-clipboard is the same as the
+// text stored in the system clipboard (provided as an argument), and therefore
+// if it is safe to use the multi-clipboard for pasting instead of the system
+// clipboard.
+func (c multiClipboard) isValid(r Register, clipboard string, ncursors int) bool {
+	content := c[r]
+	if content == nil || len(content) != ncursors {
+		return false
+	}
+
+	return clipboard == c.getAllText(r)
+}
+
+func (c multiClipboard) writeText(text string, r Register, num int, ncursors int) {
+	content := c[r]
+	if content == nil || len(content) != ncursors {
+		content = make([]string, ncursors, ncursors)
+		c[r] = content
+	}
+
+	if num >= ncursors {
+		return
+	}
+
+	content[num] = text
+}
+
+func init() {
+	multi = make(multiClipboard)
+}

internal/clipboard/terminal.go

@@ -0,0 +1,33 @@
+package clipboard
+
+import (
+	"errors"
+	"time"
+
+	"github.com/zyedidia/micro/v2/internal/screen"
+	"github.com/zyedidia/tcell/v2"
+)
+
+type terminalClipboard struct{}
+
+var terminal terminalClipboard
+
+func (t terminalClipboard) read(reg string) (string, error) {
+	screen.Screen.GetClipboard(reg)
+	// wait at most 200ms for response
+	for {
+		select {
+		case event := <-screen.Events:
+			e, ok := event.(*tcell.EventPaste)
+			if ok {
+				return e.Text(), nil
+			}
+		case <-time.After(200 * time.Millisecond):
+			return "", errors.New("No clipboard received from terminal")
+		}
+	}
+}
+
+func (t terminalClipboard) write(text, reg string) error {
+	return screen.Screen.SetClipboard(text, reg)
+}

internal/config/colorscheme.go

@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/zyedidia/tcell"
+	"github.com/zyedidia/tcell/v2"
 )
 
 // Micro's default style
@@ -117,16 +117,11 @@ func ParseColorscheme(text string) (map[string]tcell.Style, error) {
 
 // StringToStyle returns a style from a string
 // The strings must be in the format "extra foregroundcolor,backgroundcolor"
-// The 'extra' can be bold, reverse, or underline
+// The 'extra' can be bold, reverse, italic or underline
 func StringToStyle(str string) tcell.Style {
 	var fg, bg string
 	spaceSplit := strings.Split(str, " ")
-	var split []string
-	if len(spaceSplit) > 1 {
-		split = strings.Split(spaceSplit[1], ",")
-	} else {
-		split = strings.Split(str, ",")
-	}
+	split := strings.Split(spaceSplit[len(spaceSplit)-1], ",")
 	if len(split) > 1 {
 		fg, bg = split[0], split[1]
 	} else {
@@ -213,47 +208,8 @@ func StringToColor(str string) tcell.Color {
 
 // GetColor256 returns the tcell color for a number between 0 and 255
 func GetColor256(color int) tcell.Color {
-	colors := []tcell.Color{tcell.ColorBlack, tcell.ColorMaroon, tcell.ColorGreen,
-		tcell.ColorOlive, tcell.ColorNavy, tcell.ColorPurple,
-		tcell.ColorTeal, tcell.ColorSilver, tcell.ColorGray,
-		tcell.ColorRed, tcell.ColorLime, tcell.ColorYellow,
-		tcell.ColorBlue, tcell.ColorFuchsia, tcell.ColorAqua,
-		tcell.ColorWhite, tcell.Color16, tcell.Color17, tcell.Color18, tcell.Color19, tcell.Color20,
-		tcell.Color21, tcell.Color22, tcell.Color23, tcell.Color24, tcell.Color25, tcell.Color26, tcell.Color27, tcell.Color28,
-		tcell.Color29, tcell.Color30, tcell.Color31, tcell.Color32, tcell.Color33, tcell.Color34, tcell.Color35, tcell.Color36,
-		tcell.Color37, tcell.Color38, tcell.Color39, tcell.Color40, tcell.Color41, tcell.Color42, tcell.Color43, tcell.Color44,
-		tcell.Color45, tcell.Color46, tcell.Color47, tcell.Color48, tcell.Color49, tcell.Color50, tcell.Color51, tcell.Color52,
-		tcell.Color53, tcell.Color54, tcell.Color55, tcell.Color56, tcell.Color57, tcell.Color58, tcell.Color59, tcell.Color60,
-		tcell.Color61, tcell.Color62, tcell.Color63, tcell.Color64, tcell.Color65, tcell.Color66, tcell.Color67, tcell.Color68,
-		tcell.Color69, tcell.Color70, tcell.Color71, tcell.Color72, tcell.Color73, tcell.Color74, tcell.Color75, tcell.Color76,
-		tcell.Color77, tcell.Color78, tcell.Color79, tcell.Color80, tcell.Color81, tcell.Color82, tcell.Color83, tcell.Color84,
-		tcell.Color85, tcell.Color86, tcell.Color87, tcell.Color88, tcell.Color89, tcell.Color90, tcell.Color91, tcell.Color92,
-		tcell.Color93, tcell.Color94, tcell.Color95, tcell.Color96, tcell.Color97, tcell.Color98, tcell.Color99, tcell.Color100,
-		tcell.Color101, tcell.Color102, tcell.Color103, tcell.Color104, tcell.Color105, tcell.Color106, tcell.Color107, tcell.Color108,
-		tcell.Color109, tcell.Color110, tcell.Color111, tcell.Color112, tcell.Color113, tcell.Color114, tcell.Color115, tcell.Color116,
-		tcell.Color117, tcell.Color118, tcell.Color119, tcell.Color120, tcell.Color121, tcell.Color122, tcell.Color123, tcell.Color124,
-		tcell.Color125, tcell.Color126, tcell.Color127, tcell.Color128, tcell.Color129, tcell.Color130, tcell.Color131, tcell.Color132,
-		tcell.Color133, tcell.Color134, tcell.Color135, tcell.Color136, tcell.Color137, tcell.Color138, tcell.Color139, tcell.Color140,
-		tcell.Color141, tcell.Color142, tcell.Color143, tcell.Color144, tcell.Color145, tcell.Color146, tcell.Color147, tcell.Color148,
-		tcell.Color149, tcell.Color150, tcell.Color151, tcell.Color152, tcell.Color153, tcell.Color154, tcell.Color155, tcell.Color156,
-		tcell.Color157, tcell.Color158, tcell.Color159, tcell.Color160, tcell.Color161, tcell.Color162, tcell.Color163, tcell.Color164,
-		tcell.Color165, tcell.Color166, tcell.Color167, tcell.Color168, tcell.Color169, tcell.Color170, tcell.Color171, tcell.Color172,
-		tcell.Color173, tcell.Color174, tcell.Color175, tcell.Color176, tcell.Color177, tcell.Color178, tcell.Color179, tcell.Color180,
-		tcell.Color181, tcell.Color182, tcell.Color183, tcell.Color184, tcell.Color185, tcell.Color186, tcell.Color187, tcell.Color188,
-		tcell.Color189, tcell.Color190, tcell.Color191, tcell.Color192, tcell.Color193, tcell.Color194, tcell.Color195, tcell.Color196,
-		tcell.Color197, tcell.Color198, tcell.Color199, tcell.Color200, tcell.Color201, tcell.Color202, tcell.Color203, tcell.Color204,
-		tcell.Color205, tcell.Color206, tcell.Color207, tcell.Color208, tcell.Color209, tcell.Color210, tcell.Color211, tcell.Color212,
-		tcell.Color213, tcell.Color214, tcell.Color215, tcell.Color216, tcell.Color217, tcell.Color218, tcell.Color219, tcell.Color220,
-		tcell.Color221, tcell.Color222, tcell.Color223, tcell.Color224, tcell.Color225, tcell.Color226, tcell.Color227, tcell.Color228,
-		tcell.Color229, tcell.Color230, tcell.Color231, tcell.Color232, tcell.Color233, tcell.Color234, tcell.Color235, tcell.Color236,
-		tcell.Color237, tcell.Color238, tcell.Color239, tcell.Color240, tcell.Color241, tcell.Color242, tcell.Color243, tcell.Color244,
-		tcell.Color245, tcell.Color246, tcell.Color247, tcell.Color248, tcell.Color249, tcell.Color250, tcell.Color251, tcell.Color252,
-		tcell.Color253, tcell.Color254, tcell.Color255,
+	if color == 0 {
+		return tcell.ColorDefault
 	}
-
-	if color >= 0 && color < len(colors) {
-		return colors[color]
-	}
-
-	return tcell.ColorDefault
+	return tcell.PaletteColor(color)
 }

internal/config/colorscheme_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/zyedidia/tcell"
+	"github.com/zyedidia/tcell/v2"
 )
 
 func TestSimpleStringToStyle(t *testing.T) {
@@ -26,6 +26,18 @@ func TestAttributeStringToStyle(t *testing.T) {
 	assert.NotEqual(t, 0, attr&tcell.AttrBold)
 }
 
+func TestMultiAttributesStringToStyle(t *testing.T) {
+	s := StringToStyle("bold italic underline cyan,brightcyan")
+
+	fg, bg, attr := s.Decompose()
+
+	assert.Equal(t, tcell.ColorTeal, fg)
+	assert.Equal(t, tcell.ColorAqua, bg)
+	assert.NotEqual(t, 0, attr&tcell.AttrBold)
+	assert.NotEqual(t, 0, attr&tcell.AttrItalic)
+	assert.NotEqual(t, 0, attr&tcell.AttrUnderline)
+}
+
 func TestColor256StringToStyle(t *testing.T) {
 	s := StringToStyle("128,60")
 

internal/config/globals.go

@@ -5,3 +5,7 @@ const (
 )
 
 var Bindings map[string]string
+
+func init() {
+	Bindings = make(map[string]string)
+}

internal/config/plugin_installer.go

@@ -479,9 +479,7 @@ func (pl PluginPackages) GetAllVersions(name string) PluginVersions {
 	result := make(PluginVersions, 0)
 	p := pl.Get(name)
 	if p != nil {
-		for _, v := range p.Versions {
-			result = append(result, v)
-		}
+		result = append(result, p.Versions...)
 	}
 	return result
 }
@@ -607,7 +605,7 @@ func UpdatePlugins(out io.Writer, plugins []string) {
 	// if no plugins are specified, update all installed plugins.
 	if len(plugins) == 0 {
 		for _, p := range Plugins {
-			if !p.IsEnabled() {
+			if !p.IsEnabled() || p.Default {
 				continue
 			}
 			plugins = append(plugins, p.Name)

internal/config/settings.go

@@ -3,6 +3,7 @@ package config
 import (
 	"encoding/json"
 	"errors"
+	"fmt"
 	"io/ioutil"
 	"os"
 	"path/filepath"
@@ -26,16 +27,23 @@ var (
 	GlobalSettings map[string]interface{}
 
 	// This is the raw parsed json
-	parsedSettings map[string]interface{}
+	parsedSettings     map[string]interface{}
+	settingsParseError bool
+
+	// ModifiedSettings is a map of settings which should be written to disk
+	// because they have been modified by the user in this session
+	ModifiedSettings map[string]bool
 )
 
 func init() {
+	ModifiedSettings = make(map[string]bool)
 	parsedSettings = make(map[string]interface{})
 }
 
 // Options with validators
 var optionValidators = map[string]optionValidator{
 	"autosave":     validateNonNegativeValue,
+	"clipboard":    validateClipboard,
 	"tabsize":      validatePositiveValue,
 	"scrollmargin": validateNonNegativeValue,
 	"scrollspeed":  validateNonNegativeValue,
@@ -50,12 +58,14 @@ func ReadSettings() error {
 	if _, e := os.Stat(filename); e == nil {
 		input, err := ioutil.ReadFile(filename)
 		if err != nil {
+			settingsParseError = true
 			return errors.New("Error reading settings.json file: " + err.Error())
 		}
 		if !strings.HasPrefix(string(input), "null") {
 			// Unmarshal the input into the parsed map
 			err = json5.Unmarshal(input, &parsedSettings)
 			if err != nil {
+				settingsParseError = true
 				return errors.New("Error reading settings.json: " + err.Error())
 			}
 
@@ -75,16 +85,33 @@ func ReadSettings() error {
 	return nil
 }
 
+func verifySetting(option string, value reflect.Type, def reflect.Type) bool {
+	var interfaceArr []interface{}
+	switch option {
+	case "pluginrepos", "pluginchannels":
+		return value.AssignableTo(reflect.TypeOf(interfaceArr))
+	default:
+		return def.AssignableTo(value)
+	}
+}
+
 // InitGlobalSettings initializes the options map and sets all options to their default values
 // Must be called after ReadSettings
-func InitGlobalSettings() {
+func InitGlobalSettings() error {
+	var err error
 	GlobalSettings = DefaultGlobalSettings()
 
 	for k, v := range parsedSettings {
 		if !strings.HasPrefix(reflect.TypeOf(v).String(), "map") {
+			if _, ok := GlobalSettings[k]; ok && !verifySetting(k, reflect.TypeOf(v), reflect.TypeOf(GlobalSettings[k])) {
+				err = fmt.Errorf("Global Error: setting '%s' has incorrect type (%s), using default value: %v (%s)", k, reflect.TypeOf(v), GlobalSettings[k], reflect.TypeOf(GlobalSettings[k]))
+				continue
+			}
+
 			GlobalSettings[k] = v
 		}
 	}
+	return err
 }
 
 // InitLocalSettings scans the json in settings.json and sets the options locally based
@@ -97,6 +124,10 @@ func InitLocalSettings(settings map[string]interface{}, path string) error {
 			if strings.HasPrefix(k, "ft:") {
 				if settings["filetype"].(string) == k[3:] {
 					for k1, v1 := range v.(map[string]interface{}) {
+						if _, ok := settings[k1]; ok && !verifySetting(k1, reflect.TypeOf(v1), reflect.TypeOf(settings[k1])) {
+							parseError = fmt.Errorf("Error: setting '%s' has incorrect type (%s), using default value: %v (%s)", k, reflect.TypeOf(v1), settings[k1], reflect.TypeOf(settings[k1]))
+							continue
+						}
 						settings[k1] = v1
 					}
 				}
@@ -109,6 +140,10 @@ func InitLocalSettings(settings map[string]interface{}, path string) error {
 
 				if g.MatchString(path) {
 					for k1, v1 := range v.(map[string]interface{}) {
+						if _, ok := settings[k1]; ok && !verifySetting(k1, reflect.TypeOf(v1), reflect.TypeOf(settings[k1])) {
+							parseError = fmt.Errorf("Error: setting '%s' has incorrect type (%s), using default value: %v (%s)", k, reflect.TypeOf(v1), settings[k1], reflect.TypeOf(settings[k1]))
+							continue
+						}
 						settings[k1] = v1
 					}
 				}
@@ -120,10 +155,35 @@ func InitLocalSettings(settings map[string]interface{}, path string) error {
 
 // WriteSettings writes the settings to the specified filename as JSON
 func WriteSettings(filename string) error {
+	if settingsParseError {
+		// Don't write settings if there was a parse error
+		// because this will delete the settings.json if it
+		// is invalid. Instead we should allow the user to fix
+		// it manually.
+		return nil
+	}
+
 	var err error
 	if _, e := os.Stat(ConfigDir); e == nil {
+		defaults := DefaultGlobalSettings()
+
+		// remove any options froms parsedSettings that have since been marked as default
+		for k, v := range parsedSettings {
+			if !strings.HasPrefix(reflect.TypeOf(v).String(), "map") {
+				cur, okcur := GlobalSettings[k]
+				if def, ok := defaults[k]; ok && okcur && reflect.DeepEqual(cur, def) {
+					delete(parsedSettings, k)
+				}
+			}
+		}
+
+		// add any options to parsedSettings that have since been marked as non-default
 		for k, v := range GlobalSettings {
-			parsedSettings[k] = v
+			if def, ok := defaults[k]; !ok || !reflect.DeepEqual(v, def) {
+				if _, wr := ModifiedSettings[k]; wr {
+					parsedSettings[k] = v
+				}
+			}
 		}
 
 		txt, _ := json.MarshalIndent(parsedSettings, "", "    ")
@@ -132,10 +192,23 @@ func WriteSettings(filename string) error {
 	return err
 }
 
+// OverwriteSettings writes the current settings to settings.json and
+// resets any user configuration of local settings present in settings.json
 func OverwriteSettings(filename string) error {
+	settings := make(map[string]interface{})
+
 	var err error
 	if _, e := os.Stat(ConfigDir); e == nil {
-		txt, _ := json.MarshalIndent(GlobalSettings, "", "    ")
+		defaults := DefaultGlobalSettings()
+		for k, v := range GlobalSettings {
+			if def, ok := defaults[k]; !ok || !reflect.DeepEqual(v, def) {
+				if _, wr := ModifiedSettings[k]; wr {
+					settings[k] = v
+				}
+			}
+		}
+
+		txt, _ := json.MarshalIndent(settings, "", "    ")
 		err = ioutil.WriteFile(filename, append(txt, '\n'), 0644)
 	}
 	return err
@@ -144,7 +217,7 @@ func OverwriteSettings(filename string) error {
 // RegisterCommonOptionPlug creates a new option (called pl.name). This is meant to be called by plugins to add options.
 func RegisterCommonOptionPlug(pl string, name string, defaultvalue interface{}) error {
 	name = pl + "." + name
-	if v, ok := GlobalSettings[name]; !ok {
+	if _, ok := GlobalSettings[name]; !ok {
 		defaultCommonSettings[name] = defaultvalue
 		GlobalSettings[name] = defaultvalue
 		err := WriteSettings(filepath.Join(ConfigDir, "settings.json"))
@@ -152,7 +225,7 @@ func RegisterCommonOptionPlug(pl string, name string, defaultvalue interface{})
 			return errors.New("Error writing settings.json file: " + err.Error())
 		}
 	} else {
-		defaultCommonSettings[name] = v
+		defaultCommonSettings[name] = defaultvalue
 	}
 	return nil
 }
@@ -186,6 +259,7 @@ var defaultCommonSettings = map[string]interface{}{
 	"autoindent":     true,
 	"autosu":         false,
 	"backup":         true,
+	"backupdir":      "",
 	"basename":       false,
 	"colorcolumn":    float64(0),
 	"cursorline":     true,
@@ -200,9 +274,11 @@ var defaultCommonSettings = map[string]interface{}{
 	"keepautoindent": false,
 	"matchbrace":     true,
 	"mkparents":      false,
+	"permbackup":     false,
 	"readonly":       false,
 	"rmtrailingws":   false,
 	"ruler":          true,
+	"relativeruler":  false,
 	"savecursor":     false,
 	"saveundo":       false,
 	"scrollbar":      false,
@@ -247,10 +323,14 @@ func DefaultCommonSettings() map[string]interface{} {
 // default values
 var DefaultGlobalOnlySettings = map[string]interface{}{
 	"autosave":       float64(0),
+	"clipboard":      "external",
 	"colorscheme":    "default",
+	"divchars":       "|-",
+	"divreverse":     true,
 	"infobar":        true,
 	"keymenu":        false,
 	"mouse":          true,
+	"parsecursor":    false,
 	"paste":          false,
 	"savehistory":    true,
 	"sucmd":          "sudo",
@@ -372,6 +452,22 @@ func validateColorscheme(option string, value interface{}) error {
 	return nil
 }
 
+func validateClipboard(option string, value interface{}) error {
+	val, ok := value.(string)
+
+	if !ok {
+		return errors.New("Expected string type for clipboard")
+	}
+
+	switch val {
+	case "internal", "external", "terminal":
+	default:
+		return errors.New(option + " must be 'internal', 'external', or 'terminal'")
+	}
+
+	return nil
+}
+
 func validateLineEnding(option string, value interface{}) error {
 	endingType, ok := value.(string)
 

internal/display/bufwindow.go

@@ -8,7 +8,7 @@ import (
 	"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"
+	"github.com/zyedidia/tcell/v2"
 )
 
 // The BufWindow provides a way of displaying a certain section
@@ -335,7 +335,14 @@ func (w *BufWindow) drawDiffGutter(backgroundStyle tcell.Style, softwrapped bool
 }
 
 func (w *BufWindow) drawLineNum(lineNumStyle tcell.Style, softwrapped bool, maxLineNumLength int, vloc *buffer.Loc, bloc *buffer.Loc) {
-	lineNum := strconv.Itoa(bloc.Y + 1)
+	cursorLine := w.Buf.GetActiveCursor().Loc.Y
+	var lineInt int
+	if w.Buf.Settings["relativeruler"] == false || cursorLine == bloc.Y {
+		lineInt = bloc.Y + 1
+	} else {
+		lineInt = bloc.Y - cursorLine
+	}
+	lineNum := strconv.Itoa(util.Abs(lineInt))
 
 	// Write the spaces before the line number if necessary
 	for i := 0; i < maxLineNumLength-len(lineNum); i++ {
@@ -511,6 +518,13 @@ func (w *BufWindow) displayBuffer() {
 
 		draw := func(r rune, combc []rune, style tcell.Style, showcursor bool) {
 			if nColsBeforeStart <= 0 {
+				_, origBg, _ := style.Decompose()
+				_, defBg, _ := config.DefStyle.Decompose()
+
+				// syntax highlighting with non-default background takes precedence
+				// over cursor-line and color-column
+				dontOverrideBackground := origBg != defBg
+
 				for _, c := range cursors {
 					if c.HasSelection() &&
 						(bloc.GreaterEqual(c.CurSelection[0]) && bloc.LessThan(c.CurSelection[1]) ||
@@ -523,7 +537,7 @@ func (w *BufWindow) displayBuffer() {
 						}
 					}
 
-					if b.Settings["cursorline"].(bool) && w.active &&
+					if b.Settings["cursorline"].(bool) && w.active && !dontOverrideBackground &&
 						!c.HasSelection() && c.Y == bloc.Y {
 						if s, ok := config.Colorscheme["cursor-line"]; ok {
 							fg, _, _ := s.Decompose()
@@ -543,7 +557,7 @@ func (w *BufWindow) displayBuffer() {
 				if r == '\t' {
 					indentrunes := []rune(b.Settings["indentchar"].(string))
 					// if empty indentchar settings, use space
-					if indentrunes == nil || len(indentrunes) == 0 {
+					if len(indentrunes) == 0 {
 						indentrunes = []rune{' '}
 					}
 
@@ -555,7 +569,7 @@ func (w *BufWindow) displayBuffer() {
 				}
 
 				if s, ok := config.Colorscheme["color-column"]; ok {
-					if colorcolumn != 0 && vloc.X-w.gutterOffset+w.StartCol == colorcolumn {
+					if colorcolumn != 0 && vloc.X-w.gutterOffset+w.StartCol == colorcolumn && !dontOverrideBackground {
 						fg, _, _ := s.Decompose()
 						style = style.Background(fg)
 					}
@@ -659,7 +673,8 @@ func (w *BufWindow) displayBuffer() {
 		}
 
 		if vloc.X != bufWidth {
-			draw(' ', nil, curStyle, true)
+			// Display newline within a selection
+			draw(' ', nil, config.DefStyle, true)
 		}
 
 		bloc.X = w.StartCol
@@ -682,8 +697,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
@@ -702,8 +736,14 @@ func (w *BufWindow) displayScrollBar() {
 			barsize = 1
 		}
 		barstart := w.Y + int(float64(w.StartLine)/float64(w.Buf.LinesNum())*float64(w.Height))
+
+		scrollBarStyle := config.DefStyle.Reverse(true)
+		if style, ok := config.Colorscheme["scrollbar"]; ok {
+			scrollBarStyle = style
+		}
+
 		for y := barstart; y < util.Min(barstart+barsize, w.Y+bufHeight); y++ {
-			screen.SetContent(scrollX, y, '|', nil, config.DefStyle.Reverse(true))
+			screen.SetContent(scrollX, y, '|', nil, scrollBarStyle)
 		}
 	}
 }

internal/display/infowindow.go

@@ -7,7 +7,7 @@ import (
 	"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"
+	"github.com/zyedidia/tcell/v2"
 )
 
 type InfoWindow struct {

internal/display/termwindow.go

@@ -6,7 +6,7 @@ import (
 	"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/tcell/v2"
 	"github.com/zyedidia/terminal"
 )
 
@@ -81,7 +81,7 @@ func (w *TermWindow) Display() {
 			if b == terminal.DefaultBG {
 				bg = int(tcell.ColorDefault)
 			}
-			st := tcell.StyleDefault.Foreground(config.GetColor256(int(fg))).Background(config.GetColor256(int(bg)))
+			st := tcell.StyleDefault.Foreground(config.GetColor256(fg)).Background(config.GetColor256(bg))
 
 			if l.LessThan(w.Selection[1]) && l.GreaterEqual(w.Selection[0]) || l.LessThan(w.Selection[0]) && l.GreaterEqual(w.Selection[1]) {
 				st = st.Reverse(true)

internal/display/uiwindow.go

@@ -4,6 +4,7 @@ import (
 	"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"
 )
 
@@ -24,16 +25,27 @@ 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 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 {
-			w.drawNode(c)
 		}
+		w.drawNode(c)
 	}
 }
 
@@ -41,32 +53,32 @@ func (w *UIWindow) Display() {
 	w.drawNode(w.root)
 }
 
-func (w *UIWindow) GetMouseSplitID(vloc buffer.Loc) uint64 {
-	var mouseLoc func(*views.Node) uint64
-	mouseLoc = func(n *views.Node) uint64 {
+func (w *UIWindow) GetMouseSplitNode(vloc buffer.Loc) *views.Node {
+	var mouseLoc func(*views.Node) *views.Node
+	mouseLoc = func(n *views.Node) *views.Node {
 		cs := n.Children()
 		for i, c := range cs {
 			if c.Kind == views.STVert {
 				if i != len(cs)-1 {
 					if vloc.X == c.X+c.W && vloc.Y >= c.Y && vloc.Y < c.Y+c.H {
-						return c.ID()
+						return c
 					}
 				}
 			} else if c.Kind == views.STHoriz {
 				if i != len(cs)-1 {
 					if vloc.Y == c.Y+c.H-1 && vloc.X >= c.X && vloc.X < c.X+c.W {
-						return c.ID()
+						return c
 					}
 				}
 			}
 		}
 		for _, c := range cs {
 			m := mouseLoc(c)
-			if m != 0 {
+			if m != nil {
 				return m
 			}
 		}
-		return 0
+		return nil
 	}
 	return mouseLoc(w.root)
 }

internal/info/history.go

@@ -14,9 +14,9 @@ import (
 func (i *InfoBuf) LoadHistory() {
 	if config.GetGlobalOption("savehistory").(bool) {
 		file, err := os.Open(filepath.Join(config.ConfigDir, "buffers", "history"))
-		defer file.Close()
 		var decodedMap map[string][]string
 		if err == nil {
+			defer file.Close()
 			decoder := gob.NewDecoder(file)
 			err = decoder.Decode(&decodedMap)
 
@@ -48,8 +48,8 @@ func (i *InfoBuf) SaveHistory() {
 		}
 
 		file, err := os.Create(filepath.Join(config.ConfigDir, "buffers", "history"))
-		defer file.Close()
 		if err == nil {
+			defer file.Close()
 			encoder := gob.NewEncoder(file)
 
 			err = encoder.Encode(i.History)
@@ -61,6 +61,30 @@ func (i *InfoBuf) SaveHistory() {
 	}
 }
 
+// AddToHistory adds a new item to the history for the prompt type `ptype`.
+// This function is not used by micro itself. It is useful for plugins
+// which add their own items to the history, bypassing the infobar command line.
+func (i *InfoBuf) AddToHistory(ptype string, item string) {
+	if i.HasPrompt && i.PromptType == ptype {
+		return
+	}
+
+	if _, ok := i.History[ptype]; !ok {
+		i.History[ptype] = []string{item}
+	} else {
+		i.History[ptype] = append(i.History[ptype], item)
+
+		// avoid duplicates
+		h := i.History[ptype]
+		for j := len(h) - 2; j >= 0; j-- {
+			if h[j] == h[len(h)-1] {
+				i.History[ptype] = append(h[:j], h[j+1:]...)
+				break
+			}
+		}
+	}
+}
+
 // UpHistory fetches the previous item in the history
 func (i *InfoBuf) UpHistory(history []string) {
 	if i.HistoryNum > 0 && i.HasPrompt && !i.HasYN {

internal/info/infobuffer.go

@@ -54,7 +54,7 @@ func (i *InfoBuf) Close() {
 func (i *InfoBuf) Message(msg ...interface{}) {
 	// only display a new message if there isn't an active prompt
 	// this is to prevent overwriting an existing prompt to the user
-	if i.HasPrompt == false {
+	if !i.HasPrompt {
 		displayMessage := fmt.Sprint(msg...)
 		// if there is no active prompt then style and display the message as normal
 		i.Msg = displayMessage
@@ -78,7 +78,7 @@ func (i *InfoBuf) ClearGutter() {
 func (i *InfoBuf) Error(msg ...interface{}) {
 	// only display a new message if there isn't an active prompt
 	// this is to prevent overwriting an existing prompt to the user
-	if i.HasPrompt == false {
+	if !i.HasPrompt {
 		// if there is no active prompt then style and display the message as normal
 		i.Msg = fmt.Sprint(msg...)
 		i.HasMessage, i.HasError = false, true
@@ -145,8 +145,16 @@ func (i *InfoBuf) DonePrompt(canceled bool) {
 				i.PromptCallback(resp, false)
 				h := i.History[i.PromptType]
 				h[len(h)-1] = resp
+
+				// avoid duplicates
+				for j := len(h) - 2; j >= 0; j-- {
+					if h[j] == h[len(h)-1] {
+						i.History[i.PromptType] = append(h[:j], h[j+1:]...)
+						break
+					}
+				}
 			}
-			i.PromptCallback = nil
+			// i.PromptCallback = nil
 		}
 		i.Replace(i.Start(), i.End(), "")
 	}

internal/lua/lua.go

@@ -15,14 +15,17 @@ import (
 	"regexp"
 	"runtime"
 	"strings"
+	"sync"
 	"time"
 	"unicode/utf8"
 
+	humanize "github.com/dustin/go-humanize"
 	lua "github.com/yuin/gopher-lua"
 	luar "layeh.com/gopher-luar"
 )
 
 var L *lua.LState
+var Lock sync.Mutex
 
 // LoadFile loads a lua file
 func LoadFile(module string, file string, data []byte) error {
@@ -69,6 +72,8 @@ func Import(pkg string) *lua.LTable {
 		return importTime()
 	case "unicode/utf8", "utf8":
 		return importUtf8()
+	case "humanize":
+		return importHumanize()
 	default:
 		return nil
 	}
@@ -556,3 +561,12 @@ func importUtf8() *lua.LTable {
 
 	return pkg
 }
+
+func importHumanize() *lua.LTable {
+	pkg := L.NewTable()
+
+	L.SetField(pkg, "Bytes", luar.New(L, humanize.Bytes))
+	L.SetField(pkg, "Ordinal", luar.New(L, humanize.Ordinal))
+
+	return pkg
+}

internal/screen/screen.go

@@ -1,13 +1,14 @@
 package screen
 
 import (
-	"fmt"
+	"errors"
+	"log"
 	"os"
 	"sync"
 
 	"github.com/zyedidia/micro/v2/internal/config"
 	"github.com/zyedidia/micro/v2/internal/util"
-	"github.com/zyedidia/tcell"
+	"github.com/zyedidia/tcell/v2"
 )
 
 // Screen is the tcell screen we use to draw to the terminal
@@ -18,6 +19,9 @@ import (
 // same time too.
 var Screen tcell.Screen
 
+// Events is the channel of tcell events
+var Events chan (tcell.Event)
+
 // The lock is necessary since the screen is polled on a separate thread
 var lock sync.Mutex
 
@@ -97,6 +101,10 @@ func ShowCursor(x, y int) {
 // SetContent sets a cell at a point on the screen and makes sure that it is
 // synced with the last cursor location
 func SetContent(x, y int, mainc rune, combc []rune, style tcell.Style) {
+	if !Screen.CanDisplay(mainc, true) {
+		mainc = '<27>'
+	}
+
 	Screen.SetContent(x, y, mainc, combc, style)
 	if util.FakeCursor && lastCursor.x == x && lastCursor.y == y {
 		lastCursor.r = mainc
@@ -126,8 +134,8 @@ func TempStart(screenWasNil bool) {
 }
 
 // Init creates and initializes the tcell screen
-func Init() {
-	drawChan = make(chan bool)
+func Init() error {
+	drawChan = make(chan bool, 8)
 
 	// Should we enable true color?
 	truecolor := os.Getenv("MICRO_TRUECOLOR") == "1"
@@ -137,30 +145,67 @@ func Init() {
 	}
 
 	var oldTerm string
-	if config.GetGlobalOption("xterm").(bool) {
+	modifiedTerm := false
+	setXterm := func() {
 		oldTerm = os.Getenv("TERM")
 		os.Setenv("TERM", "xterm-256color")
+		modifiedTerm = true
+	}
+
+	if config.GetGlobalOption("xterm").(bool) {
+		setXterm()
 	}
 
 	// Initilize tcell
 	var err error
 	Screen, err = tcell.NewScreen()
 	if err != nil {
-		fmt.Println(err)
-		fmt.Println("Fatal: Micro could not initialize a Screen.")
-		os.Exit(1)
+		log.Println("Warning: during screen initialization:", err)
+		log.Println("Falling back to TERM=xterm-256color")
+		setXterm()
+		Screen, err = tcell.NewScreen()
+		if err != nil {
+			return err
+		}
 	}
 	if err = Screen.Init(); err != nil {
-		fmt.Println(err)
-		os.Exit(1)
+		return err
 	}
 
+	Screen.SetPaste(config.GetGlobalOption("paste").(bool))
+
 	// restore TERM
-	if config.GetGlobalOption("xterm").(bool) {
+	if modifiedTerm {
 		os.Setenv("TERM", oldTerm)
 	}
 
 	if config.GetGlobalOption("mouse").(bool) {
 		Screen.EnableMouse()
 	}
+
+	return nil
+}
+
+// InitSimScreen initializes a simulation screen for testing purposes
+func InitSimScreen() (tcell.SimulationScreen, error) {
+	drawChan = make(chan bool, 8)
+
+	// Initilize tcell
+	var err error
+	s := tcell.NewSimulationScreen("")
+	if s == nil {
+		return nil, errors.New("Failed to get a simulation screen")
+	}
+	if err = s.Init(); err != nil {
+		return nil, err
+	}
+
+	s.SetSize(80, 24)
+	Screen = s
+
+	if config.GetGlobalOption("mouse").(bool) {
+		Screen.EnableMouse()
+	}
+
+	return s, nil
 }

internal/shell/job.go

@@ -37,6 +37,12 @@ type CallbackFile struct {
 	args     []interface{}
 }
 
+// Job stores the executing command for the job, and the stdin pipe
+type Job struct {
+	*exec.Cmd
+	Stdin io.WriteCloser
+}
+
 func (f *CallbackFile) Write(data []byte) (int, error) {
 	// This is either stderr or stdout
 	// In either case we create a new job function callback and put it in the jobs channel
@@ -47,13 +53,13 @@ func (f *CallbackFile) Write(data []byte) (int, error) {
 
 // JobStart starts a shell command in the background with the given callbacks
 // It returns an *exec.Cmd as the job id
-func JobStart(cmd string, onStdout, onStderr, onExit func(string, []interface{}), userargs ...interface{}) *exec.Cmd {
+func JobStart(cmd string, onStdout, onStderr, onExit func(string, []interface{}), userargs ...interface{}) *Job {
 	return JobSpawn("sh", []string{"-c", cmd}, onStdout, onStderr, onExit, userargs...)
 }
 
 // JobSpawn starts a process with args in the background with the given callbacks
 // It returns an *exec.Cmd as the job id
-func JobSpawn(cmdName string, cmdArgs []string, onStdout, onStderr, onExit func(string, []interface{}), userargs ...interface{}) *exec.Cmd {
+func JobSpawn(cmdName string, cmdArgs []string, onStdout, onStderr, onExit func(string, []interface{}), userargs ...interface{}) *Job {
 	// Set up everything correctly if the functions have been provided
 	proc := exec.Command(cmdName, cmdArgs...)
 	var outbuf bytes.Buffer
@@ -67,6 +73,7 @@ func JobSpawn(cmdName string, cmdArgs []string, onStdout, onStderr, onExit func(
 	} else {
 		proc.Stderr = &outbuf
 	}
+	stdin, _ := proc.StdinPipe()
 
 	go func() {
 		// Run the process in the background and create the onExit callback
@@ -75,20 +82,15 @@ func JobSpawn(cmdName string, cmdArgs []string, onStdout, onStderr, onExit func(
 		Jobs <- jobFunc
 	}()
 
-	return proc
+	return &Job{proc, stdin}
 }
 
 // JobStop kills a job
-func JobStop(cmd *exec.Cmd) {
-	cmd.Process.Kill()
+func JobStop(j *Job) {
+	j.Process.Kill()
 }
 
 // JobSend sends the given data into the job's stdin stream
-func JobSend(cmd *exec.Cmd, data string) {
-	stdin, err := cmd.StdinPipe()
-	if err != nil {
-		return
-	}
-
-	stdin.Write([]byte(data))
+func JobSend(j *Job, data string) {
+	j.Stdin.Write([]byte(data))
 }

internal/util/unicode.go

@@ -16,6 +16,16 @@ import (
 // For rendering, micro will display the combining characters. It's not perfect
 // but it's pretty good.
 
+var minMark = rune(unicode.Mark.R16[0].Lo)
+
+func isMark(r rune) bool {
+	// Fast path
+	if r < minMark {
+		return false
+	}
+	return unicode.In(r, unicode.Mark)
+}
+
 // 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) {
@@ -24,7 +34,7 @@ func DecodeCharacter(b []byte) (rune, []rune, int) {
 	c, s := utf8.DecodeRune(b)
 
 	var combc []rune
-	for unicode.In(c, unicode.Mark) {
+	for isMark(c) {
 		combc = append(combc, c)
 		size += s
 
@@ -43,7 +53,7 @@ func DecodeCharacterInString(str string) (rune, []rune, int) {
 	c, s := utf8.DecodeRuneInString(str)
 
 	var combc []rune
-	for unicode.In(c, unicode.Mark) {
+	for isMark(c) {
 		combc = append(combc, c)
 		size += s
 
@@ -61,7 +71,7 @@ func CharacterCount(b []byte) int {
 
 	for len(b) > 0 {
 		r, size := utf8.DecodeRune(b)
-		if !unicode.In(r, unicode.Mark) {
+		if !isMark(r) {
 			s++
 		}
 
@@ -77,7 +87,7 @@ func CharacterCountInString(str string) int {
 	s := 0
 
 	for _, r := range str {
-		if !unicode.In(r, unicode.Mark) {
+		if !isMark(r) {
 			s++
 		}
 	}

internal/util/util.go

@@ -336,6 +336,10 @@ func GetModTime(path string) (time.Time, error) {
 // EscapePath replaces every path separator in a given path with a %
 func EscapePath(path string) string {
 	path = filepath.ToSlash(path)
+	if runtime.GOOS == "windows" {
+		// ':' is not valid in a path name on Windows but is ok on Unix
+		path = strings.Replace(path, ":", "%", -1)
+	}
 	return strings.Replace(path, "/", "%", -1)
 }
 
@@ -418,6 +422,10 @@ func IsNonAlphaNumeric(c rune) bool {
 	return !unicode.IsLetter(c) && !unicode.IsNumber(c) && c != '_'
 }
 
+func IsAutocomplete(c rune) bool {
+	return c == '.' || !IsNonAlphaNumeric(c)
+}
+
 func ParseSpecial(s string) string {
 	return strings.Replace(s, "\\t", "\t", -1)
 }

pkg/highlight/unicode.go

@@ -5,6 +5,16 @@ import (
 	"unicode/utf8"
 )
 
+var minMark = rune(unicode.Mark.R16[0].Lo)
+
+func isMark(r rune) bool {
+	// Fast path
+	if r < minMark {
+		return false
+	}
+	return unicode.In(r, unicode.Mark)
+}
+
 // 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) {
@@ -13,7 +23,7 @@ func DecodeCharacter(b []byte) (rune, []rune, int) {
 	c, s := utf8.DecodeRune(b)
 
 	var combc []rune
-	for unicode.In(c, unicode.Mark) {
+	for isMark(c) {
 		combc = append(combc, c)
 		size += s
 
@@ -32,7 +42,7 @@ func DecodeCharacterInString(str string) (rune, []rune, int) {
 	c, s := utf8.DecodeRuneInString(str)
 
 	var combc []rune
-	for unicode.In(c, unicode.Mark) {
+	for isMark(c) {
 		combc = append(combc, c)
 		size += s
 
@@ -50,7 +60,7 @@ func CharacterCount(b []byte) int {
 
 	for len(b) > 0 {
 		r, size := utf8.DecodeRune(b)
-		if !unicode.In(r, unicode.Mark) {
+		if !isMark(r) {
 			s++
 		}
 
@@ -66,7 +76,7 @@ func CharacterCountInString(str string) int {
 	s := 0
 
 	for _, r := range str {
-		if !unicode.In(r, unicode.Mark) {
+		if !isMark(r) {
 			s++
 		}
 	}

runtime/colorschemes/default.micro

@@ -5,7 +5,7 @@ color-link constant "#AE81FF,#282828"
 color-link constant.string "#E6DB74,#282828"
 color-link constant.string.char "#BDE6AD,#282828"
 color-link statement "#F92672,#282828"
-color-link symbol "#F92672,#282828"
+color-link symbol.operator "#F92671,#282828"
 color-link preproc "#CB4B16,#282828"
 color-link type "#66D9EF,#282828"
 color-link special "#A6E22E,#282828"

runtime/colorschemes/monokai.micro

@@ -5,7 +5,7 @@ color-link constant "#AE81FF,#282828"
 color-link constant.string "#E6DB74,#282828"
 color-link constant.string.char "#BDE6AD,#282828"
 color-link statement "#F92672,#282828"
-color-link symbol "#F92672,#282828"
+color-link symbol.operator "#F92672,#282828"
 color-link preproc "#CB4B16,#282828"
 color-link type "#66D9EF,#282828"
 color-link special "#A6E22E,#282828"

runtime/colorschemes/railscast.micro

@@ -3,6 +3,7 @@ color-link comment "#bc9458,#2b2b2b"
 color-link statement "#cc7833,#2b2b2b"
 color-link constant "#a5c261,#2b2b2b"
 color-link constant.bool "#6d9cbe,#2b2b2b"
+color-link constant.specialChar "#459231,#2b2b2b"
 color-link type "#6d9cbe,#2b2b2b"
 color-link preproc "#cc7833,#2b2b2b"
 color-link special "#cc7833,#2b2b2b"
@@ -11,16 +12,18 @@ color-link todo "bold #cc7833,#2b2b2b"
 color-link error "bold #cc7833,#2b2b2b"
 color-link gutter-error "#cc7833,#11151C"
 color-link indent-char "#414141,#2b2b2b"
-color-link line-number "#a1a1a1,#353535"
+color-link line-number "#a1a1a1,#232323"
 color-link current-line-number "#e6e1dc,#2b2b2b"
 color-link diff-added "#00AF00"
 color-link diff-modified "#FFAF00"
 color-link diff-deleted "#D70000"
 color-link gutter-warning "#a5c261,#11151C"
 color-link symbol "#edb753,#2b2b2b"
+color-link symbol.operator "#cc7833,#2b2b2b"
+color-link symbol.brackets "#cc7833,#2b2b2b"
 color-link identifier "#edb753,#2b2b2b"
-color-link statusline "#a1a1a1,#414141"
-color-link tabbar "bold #a1a1a1,#414141"
+color-link statusline "#b1b1b1,#232323"
+color-link tabbar "bold #b1b1b1,#232323"
 color-link cursor-line "#353535"
 color-link color-column "#353535"
 color-link space "underline #e6e1dc,#2b2b2b"

runtime/help/colors.md

@@ -8,7 +8,7 @@ This help page aims to cover two aspects of micro's syntax highlighting engine:
 
 ## Colorschemes
 
-To change your colorscheme, press CtrlE in micro to bring up the command
+To change your colorscheme, press Ctrl-e in micro to bring up the command
 prompt, and type:
 
 ```

runtime/help/commands.md

@@ -1,6 +1,6 @@
 # Command bar
 
-The command bar is opened by pressing CtrlE. It is a single-line buffer,
+The command bar is opened by pressing Ctrl-e. It is a single-line buffer,
 meaning that all keybindings from a normal buffer are supported (as well
 as mouse and selection).
 
@@ -13,7 +13,7 @@ does not look up environment variables.
 # Commands
 
 Micro provides the following commands that can be executed at the command-bar
-by pressing `CtrlE` and entering the command. Arguments are placed in single
+by pressing `Ctrl-e` and entering the command. Arguments are placed in single
 quotes here but these are not necessary when entering the command in micro.
 
 * `bind 'key' 'action'`: creates a keybinding from key to action. See the
@@ -109,7 +109,7 @@ quotes here but these are not necessary when entering the command in micro.
    is most useful for debugging keybindings.
 
 * `showkey`: Show the action(s) bound to a given key. For example
-   running `> showkey CtrlC` will display `Copy`.
+   running `> showkey Ctrl-c` will display `Copy`.
 
 * `term exec?`: Open a terminal emulator running the given executable. If no
    executable is given, this will open the default shell in the terminal

runtime/help/copypaste.md

@@ -4,8 +4,52 @@ because there are multiple methods. This help document will explain
 the various methods for copying and pasting, how they work,
 and the best methods for doing so over SSH.
 
+# OSC 52 (terminal clipboard)
+
+If possible, setting the `clipboard` option to `terminal` will give
+best results because it will work over SSH and locally. However, there
+is limited support among terminal emulators for the terminal clipboard
+(which uses the OSC 52 protocol to communicate clipboard contents).
+Here is a list of terminal emulators and their status:
+
+* Kitty: supported, but only writing is enabled by default. To enable
+  reading, add `read-primary` and `read-clipboard` to the
+  `clipboard_control` option.
+
+* iTerm2: only copying (writing to clipboard) is supported. Must be enabled in
+  `Preferences->General-> Selection->Applications in terminal may access clipboard`.
+  You can use Command-v to paste.
+
+* `st`: supported.
+
+* `rxvt-unicode`: not natively supported, but there is a Perl extension
+   [here](http://anti.teamidiot.de/static/nei/*/Code/urxvt/).
+
+* `xterm`: supported, but disabled by default. It can be enabled by putting
+   the following in `.Xresources` or `.Xdefaults`:
+   `XTerm*disallowedWindowOps: 20,21,SetXprop`.
+
+* `gnome-terminal`: does not support OSC 52.
+
+**Summary:** If you want copy and paste to work over SSH, then you
+should set `clipboard` to `terminal`, and make sure your terminal
+supports OSC 52.
+
 # Pasting
 
+## Recommendations (TL;DR)
+
+The recommended method of pasting is the following:
+
+* If you are not working over SSH, use the micro keybinding (Ctrl-v
+  by default) to perform pastes. If on Linux, install `xclip` or
+  `xsel` beforehand.
+
+* If you are working over SSH, use the terminal keybinding
+  (Ctrl-Shift-v or Command-v) to perform pastes. If your terminal
+  does not support bracketed paste, when performing a paste first
+  enable the `paste` option, and when finished disable the option.
+
 ## Micro paste events
 
 Micro is an application that runs within the terminal. This means
@@ -56,20 +100,23 @@ machine's clipboard. On the other hand, the terminal keybinding
 for paste will access your local clipboard and send the text over
 the network as a paste event, which is what you want.
 
-## Recommendations
+# Copying
 
-The recommended method of pasting is the following:
+# Recommendations (TL;DR)
 
-* If you are not working over SSH, use the micro keybinding (Ctrl-v
-  by default) to perform pastes. If on Linux, install `xclip` or
-  `xsel` beforehand.
+The recommended method of copying is the following:
+
+* If you are not working over SSH, use the micro keybinding (Ctrl-c by
+  default) to perform copies. If on Linux, install `xclip` or `xsel`
+  beforehand.
 
 * If you are working over SSH, use the terminal keybinding
-  (Ctrl-Shift-v or Command-v) to perform pastes. If your terminal
-  does not support bracketed paste, when performing a paste first
-  enable the `paste` option, and when finished disable the option.
-
-# Copying
+  (Ctrl-Shift-c or Command-c) to perform copies. You must first disable
+  the `mouse` option to perform a terminal selection, and you may wish
+  to disable line numbers and diff indicators (`ruler` and `diffgutter`
+  options) and close other splits. This method will only be able to copy
+  characters that are displayed on the screen (you will not be able to
+  copy more than one page's worth of characters).
 
 Copying follows a similar discussion to the one above about pasting.
 The primary difference is before performing a copy, the application
@@ -92,19 +139,3 @@ means that for copying multiple lines using the terminal selection, you
 should first disable line numbers and diff indicators (turn off the `ruler`
 and `diffgutter` options), otherwise they might be part of your selection
 and copied.
-
-## Recommendations
-
-The recommended method of copying is the following:
-
-* If you are not working over SSH, use the micro keybinding (Ctrl-c by
-  default) to perform copies. If on Linux, install `xclip` or `xsel`
-  beforehand.
-
-* If you are working over SSH, use the terminal keybinding
-  (Ctrl-Shift-c or Command-c) to perform copies. You must first disable
-  the `mouse` option to perform a terminal selection, and you may wish
-  to disable line numbers and diff indicators (`ruler` and `diffgutter`
-  options) and close other splits. This method will only be able to copy
-  characters that are displayed on the screen (you will not be able to
-  copy more than one page's worth of characters).

runtime/help/defaultkeys.md

@@ -11,115 +11,115 @@ can change it!
 
 | Key       | Description of function                                                                           |
 |---------- |-------------------------------------------------------------------------------------------------- |
-| Ctrl+E    | Open a command prompt for running commands (see `> help commands` for a list of valid commands).  |
+| Ctrl-e    | Open a command prompt for running commands (see `> help commands` for a list of valid commands).  |
 | Tab       | In command prompt, it will autocomplete if possible.                                              |
-| Ctrl+B    | Run a shell command (this will close micro while your command executes).                          |
+| Ctrl-b    | Run a shell command (this will close micro while your command executes).                          |
 
 ### Navigation
 
 | Key                         | Description of function                                                                   |
 |---------------------------- |------------------------------------------------------------------------------------------ |
 | Arrows                      | Move the cursor around                                                                    |
-| Shift+arrows                | Move and select text                                                                      |
-| Alt(Ctrl on Mac)+LeftArrow  | Move to the beginning of the current line                                                 |
-| Alt(Ctrl on Mac)+RightArrow | Move to the end of the current line                                                       |
+| Shift-arrows                | Move and select text                                                                      |
+| Alt(Ctrl on Mac)-LeftArrow  | Move to the beginning of the current line                                                 |
+| Alt(Ctrl on Mac)-RightArrow | Move to the end of the current line                                                       |
 | Home                        | Move to the beginning of text on the current line                                                 |
 | End                         | Move to the end of the current line                                                       |
-| Ctrl(Alt on Mac)+LeftArrow  | Move cursor one word left                                                                 |
-| Ctrl(Alt on Mac)+RightArrow | Move cursor one word right                                                                |
-| Alt+{                       | Move cursor to previous empty line, or beginning of document                              |
-| Alt+}                       | Move cursor to next empty line, or end of document                                        |
+| Ctrl(Alt on Mac)-LeftArrow  | Move cursor one word left                                                                 |
+| Ctrl(Alt on Mac)-RightArrow | Move cursor one word right                                                                |
+| Alt-{                       | Move cursor to previous empty line, or beginning of document                              |
+| Alt-}                       | Move cursor to next empty line, or end of document                                        |
 | PageUp                      | Move cursor up one page                                                                   |
 | PageDown                    | Move cursor down one page                                                                 |
-| Ctrl+Home or Ctrl+UpArrow   | Move cursor to start of document                                                          |
-| Ctrl+End or Ctrl+DownArrow  | Move cursor to end of document                                                            |
-| Ctrl+L                      | Jump to a line in the file (prompts with #)                                               |
-| Ctrl+W                      | Cycle between splits in the current tab (use `> vsplit` or `> hsplit` to create a split)  |
+| Ctrl-Home or Ctrl-UpArrow   | Move cursor to start of document                                                          |
+| Ctrl-End or Ctrl-DownArrow  | Move cursor to end of document                                                            |
+| Ctrl-l                      | Jump to a line in the file (prompts with #)                                               |
+| Ctrl-w                      | Cycle between splits in the current tab (use `> vsplit` or `> hsplit` to create a split)  |
 
 ### Tabs
 
 | Key     | Description of function   |
 |-------- |-------------------------  |
-| Ctrl+T  | Open a new tab            |
-| Alt+,   | Previous tab              |
-| Alt+.   | Next tab                  |
+| Ctrl-t  | Open a new tab            |
+| Alt-,   | Previous tab              |
+| Alt-.   | Next tab                  |
 
 ### Find Operations
 
 | Key       | Description of function                   |
 |---------- |------------------------------------------ |
-| Ctrl+F    | Find (opens prompt)                       |
-| Ctrl+N    | Find next instance of current search      |
-| Ctrl+P    | Find previous instance of current search  |
+| Ctrl-f    | Find (opens prompt)                       |
+| Ctrl-n    | Find next instance of current search      |
+| Ctrl-p    | Find previous instance of current search  |
 
 ### File Operations
 
 | Key       | Description of function                                           |
 |---------- |------------------------------------------------------------------ |
-| Ctrl+Q    | Close current file (quits micro if this is the last file open)    |
-| Ctrl+O    | Open a file (prompts for filename)                                |
-| Ctrl+S    | Save current file                                                 |
+| Ctrl-q    | Close current file (quits micro if this is the last file open)    |
+| Ctrl-o    | Open a file (prompts for filename)                                |
+| Ctrl-s    | Save current file                                                 |
 
 ### Text operations
 
 | Key                                 | Description of function                   |
 |------------------------------------ |------------------------------------------ |
-| Ctrl(Alt on Mac)+Shift+RightArrow   | Select word right                         |
-| Ctrl(Alt on Mac)+Shift+LeftArrow    | Select word left                          |
-| Alt(Ctrl on Mac)+Shift+LeftArrow    | Select to start of current line           |
-| Alt(Ctrl on Mac)+Shift+RightArrow   | Select to end of current line             |
-| Shift+Home                          | Select to start of current line           |
-| Shift+End                           | Select to end of current line             |
-| Ctrl+Shift+UpArrow                  | Select to start of file                   |
-| Ctrl+Shift+DownArrow                | Select to end of file                     |
-| Ctrl+X                              | Cut selected text                         |
-| Ctrl+C                              | Copy selected text                        |
-| Ctrl+V                              | Paste                                     |
-| Ctrl+K                              | Cut current line                          |
-| Ctrl+D                              | Duplicate current line                    |
-| Ctrl+Z                              | Undo                                      |
-| Ctrl+Y                              | Redo                                      |
-| Alt+UpArrow                         | Move current line or selected lines up    |
-| Alt+DownArrow                       | Move current line of selected lines down  |
-| Alt+Backspace or Alt+Ctrl+H         | Delete word left                          |
-| Ctrl+A                              | Select all                                |
+| Ctrl(Alt on Mac)-Shift-RightArrow   | Select word right                         |
+| Ctrl(Alt on Mac)-Shift-LeftArrow    | Select word left                          |
+| Alt(Ctrl on Mac)-Shift-LeftArrow    | Select to start of current line           |
+| Alt(Ctrl on Mac)-Shift-RightArrow   | Select to end of current line             |
+| Shift-Home                          | Select to start of current line           |
+| Shift-End                           | Select to end of current line             |
+| Ctrl-Shift-UpArrow                  | Select to start of file                   |
+| Ctrl-Shift-DownArrow                | Select to end of file                     |
+| Ctrl-x                              | Cut selected text                         |
+| Ctrl-c                              | Copy selected text                        |
+| Ctrl-v                              | Paste                                     |
+| Ctrl-k                              | Cut current line                          |
+| Ctrl-d                              | Duplicate current line                    |
+| Ctrl-z                              | Undo                                      |
+| Ctrl-y                              | Redo                                      |
+| Alt-UpArrow                         | Move current line or selected lines up    |
+| Alt-DownArrow                       | Move current line or selected lines down  |
+| Alt-Backspace or Alt-Ctrl-h         | Delete word left                          |
+| Ctrl-a                              | Select all                                |
 
 ### Macros
 
 | Key       | Description of function                                                           |
 |---------- |---------------------------------------------------------------------------------- |
-| Ctrl+U    | Toggle macro recording (press Ctrl+U to start recording and press again to stop)  |
-| Ctrl+J    | Run latest recorded macro                                                         |
+| Ctrl-u    | Toggle macro recording (press Ctrl-u to start recording and press again to stop)  |
+| Ctrl-j    | Run latest recorded macro                                                         |
 
 ### Multiple cursors
 
 | Key               | Description of function                                                                       |
 |------------------ |---------------------------------------------------------------------------------------------- |
-| Alt+N             | Create new multiple cursor from selection (will select current word if no current selection)  |
-| AltShiftUp        | Spawn a new cursor on the line above the current one                                          |
-| AltShiftDown      | Spawn a new cursor on the line below the current one                                          |
-| Alt+P             | Remove latest multiple cursor                                                                 |
-| Alt+C             | Remove all multiple cursors (cancel)                                                          |
-| Alt+X             | Skip multiple cursor selection                                                                |
-| Alt+M             | Spawn a new cursor at the beginning of every line in the current selection                    |
-| Ctrl+MouseLeft    | Place a multiple cursor at any location                                                       |
+| Alt-n             | Create new multiple cursor from selection (will select current word if no current selection)  |
+| Alt-Shift-Up      | Spawn a new cursor on the line above the current one                                          |
+| Alt-Shift-Down    | Spawn a new cursor on the line below the current one                                          |
+| Alt-p             | Remove latest multiple cursor                                                                 |
+| Alt-c             | Remove all multiple cursors (cancel)                                                          |
+| Alt-x             | Skip multiple cursor selection                                                                |
+| Alt-m             | Spawn a new cursor at the beginning of every line in the current selection                    |
+| Ctrl-MouseLeft    | Place a multiple cursor at any location                                                       |
 
 ### Other
 
 | Key       | Description of function                                                               |
 |---------- |-------------------------------------------------------------------------------------- |
-| Ctrl+G    | Open help file                                                                        |
-| Ctrl+H    | Backspace (old terminals do not support the backspace key and use Ctrl+H instead)     |
-| Ctrl+R    | Toggle the line number ruler                                                          |
+| Ctrl-g    | Open help file                                                                        |
+| Ctrl-h    | Backspace (old terminals do not support the backspace key and use Ctrl+H instead)     |
+| Ctrl-r    | Toggle the line number ruler                                                          |
 
 ### Emacs style actions
 
 | Key       | Description of function   |
 |---------- |-------------------------- |
-| Alt+F     | Next word                 |
-| Alt+B     | Previous word             |
-| Alt+A     | Move to start of line     |
-| Alt+E     | Move to end of line       |
+| Alt-f     | Next word                 |
+| Alt-b     | Previous word             |
+| Alt-a     | Move to start of line     |
+| Alt-e     | Move to end of line       |
 
 ### Function keys.
 

runtime/help/help.md

@@ -4,9 +4,9 @@ Micro is a terminal-based text editor that aims to be easy to use and
 intuitive, while also taking advantage of the full capabilities of modern
 terminals.
 
-To open the command bar, press CtrlE. This enables a `>` prompt for typing
+To open the command bar, press Ctrl-e. This enables a `>` prompt for typing
 commands. From now on when the documentation says to run a command such as `>
-help`, this means press CtrlE and type `help` (and press enter to execute the
+help`, this means press Ctrl-e and type `help` (and press enter to execute the
 command).
 
 For a list of the default keybindings run `> help defaultkeys`.
@@ -14,7 +14,7 @@ For more information on keybindings see `> help keybindings`.
 
 ## Quick-start
 
-Press Ctrl-q to quit, and Ctrl-s to save. Press CtrlE to start typing commands
+Press Ctrl-q to quit, and Ctrl-s to save. Press Ctrl-e to start typing commands
 and you can see which commands are available by pressing tab, or by viewing the
 help topic `> help commands`.
 
@@ -34,7 +34,7 @@ Press Ctrl-w to move between splits, and type `> vsplit filename` or
 
 Micro has a built-in help system which can be accessed with the `help` command.
 
-To use it, press CtrlE to access command mode and type in `help` followed by a
+To use it, press Ctrl-e to access command mode and type in `help` followed by a
 topic. Typing `help` followed by nothing will open this page.
 
 Here are the possible help topics that you can read:

runtime/help/keybindings.md

@@ -4,7 +4,7 @@ Micro has a plethora of hotkeys that make it easy and powerful to use and all
 hotkeys are fully customizable to your liking.
 
 Custom keybindings are stored internally in micro if changed with the `> bind`
-command or you can also be added in the file `~/.config/micro/bindings.json` as
+command or can also be added in the file `~/.config/micro/bindings.json` as
 discussed below. For a list of the default keybindings in the json format used
 by micro, please see the end of this file. For a more user-friendly list with
 explanations of what the default hotkeys are and what they do, please see
@@ -30,11 +30,17 @@ following in the `bindings.json` file.
 
 ```json
 {
-	"CtrlY": "Undo",
-	"CtrlZ": "Redo"
+	"Ctrl-y": "Undo",
+	"Ctrl-z": "Redo"
 }
 ```
 
+**Note:** The syntax `<Modifier><key>` is equivalent to `<Modifier>-<key>`. In
+addition, Ctrl-Shift bindings are not supported by terminals, and are the same
+as simply Ctrl bindings. This means that `CtrlG`, `Ctrl-G`, and `Ctrl-g` all
+mean the same thing. However, for Alt this is not the case: `AltG` and `Alt-G`
+mean `Alt-Shift-g`, while `Alt-g` does not require the Shift modifier.
+
 In addition to editing your `~/.config/micro/bindings.json`, you can run
 `>bind <keycombo> <action>` For a list of bindable actions, see below.
 
@@ -73,21 +79,27 @@ You can also bind a key to execute a command in command mode (see
 }
 ```
 
+**Note for macOS**: By default, macOS terminals do not forward alt events and
+instead insert unicode characters. To fix this, do the following:
+
+* iTerm2: select `Esc+` for `Left Option Key` in `Preferences->Profiles->Keys`.
+* Terminal.app: Enable `Use Option key as Meta key` in `Preferences->Profiles->Keyboard`.
+
 Now when you press `Alt-p` the `pwd` command will be executed which will show
 your working directory in the infobar.
 
 You can also bind an "editable" command with `command-edit:`. This means that 
 micro won't immediately execute the command when you press the binding, but
 instead just place the string in the infobar in command mode. For example, 
-you could rebind `CtrlG` to `> help`:
+you could rebind `Ctrl-g` to `> help`:
 
 ```json
 {
-    "CtrlG": "command-edit:help "
+    "Ctrl-g": "command-edit:help "
 }
 ```
 
-Now when you press `CtrlG`, `help` will appear in the command bar and your
+Now when you press `Ctrl-g`, `help` will appear in the command bar and your
 cursor will be placed after it (note the space in the json that controls the
 cursor placement).
 
@@ -351,32 +363,32 @@ F62
 F63
 F64
 CtrlSpace
-CtrlA
-CtrlB
-CtrlC
-CtrlD
-CtrlE
-CtrlF
-CtrlG
-CtrlH
-CtrlI
-CtrlJ
-CtrlK
-CtrlL
-CtrlM
-CtrlN
-CtrlO
-CtrlP
-CtrlQ
-CtrlR
-CtrlS
-CtrlT
-CtrlU
-CtrlV
-CtrlW
-CtrlX
-CtrlY
-CtrlZ
+Ctrl-a
+Ctrl-b
+Ctrl-c
+Ctrl-d
+Ctrl-e
+Ctrl-f
+Ctrl-g
+Ctrl-h
+Ctrl-i
+Ctrl-j
+Ctrl-k
+Ctrl-l
+Ctrl-m
+Ctrl-n
+Ctrl-o
+Ctrl-p
+Ctrl-q
+Ctrl-r
+Ctrl-s
+Ctrl-t
+Ctrl-u
+Ctrl-v
+Ctrl-w
+Ctrl-x
+Ctrl-y
+Ctrl-z
 CtrlLeftSq
 CtrlBackslash
 CtrlRightSq
@@ -403,6 +415,11 @@ MouseWheelLeft
 MouseWheelRight
 ```
 
+## Key sequences
+
+Key sequences can be bound by specifying valid keys one after another in brackets, such
+as `<Ctrl-x><Ctrl-c>`.
+
 # Default keybinding configuration.
 
 A select few keybindings are different on MacOS compared to other
@@ -444,28 +461,28 @@ conventions for text editing defaults.
     "Alt-{":          "ParagraphPrevious",
     "Alt-}":          "ParagraphNext",
     "Enter":          "InsertNewline",
-    "CtrlH":          "Backspace",
+    "Ctrl-h":          "Backspace",
     "Backspace":      "Backspace",
     "Alt-CtrlH":      "DeleteWordLeft",
     "Alt-Backspace":  "DeleteWordLeft",
     "Tab":            "Autocomplete|IndentSelection|InsertTab",
     "Backtab":        "OutdentSelection|OutdentLine",
-    "CtrlO":          "OpenFile",
-    "CtrlS":          "Save",
-    "CtrlF":          "Find",
-    "CtrlN":          "FindNext",
-    "CtrlP":          "FindPrevious",
-    "CtrlZ":          "Undo",
-    "CtrlY":          "Redo",
-    "CtrlC":          "CopyLine|Copy",
-    "CtrlX":          "Cut",
-    "CtrlK":          "CutLine",
-    "CtrlD":          "DuplicateLine",
-    "CtrlV":          "Paste",
-    "CtrlA":          "SelectAll",
-    "CtrlT":          "AddTab",
-    "Alt,":           "PreviousTab",
-    "Alt.":           "NextTab",
+    "Ctrl-o":          "OpenFile",
+    "Ctrl-s":          "Save",
+    "Ctrl-f":          "Find",
+    "Ctrl-n":          "FindNext",
+    "Ctrl-p":          "FindPrevious",
+    "Ctrl-z":          "Undo",
+    "Ctrl-y":          "Redo",
+    "Ctrl-c":          "CopyLine|Copy",
+    "Ctrl-x":          "Cut",
+    "Ctrl-k":          "CutLine",
+    "Ctrl-d":          "DuplicateLine",
+    "Ctrl-v":          "Paste",
+    "Ctrl-a":          "SelectAll",
+    "Ctrl-t":          "AddTab",
+    "Alt-,":           "PreviousTab",
+    "Alt-.":           "NextTab",
     "Home":           "StartOfText",
     "End":            "EndOfLine",
     "CtrlHome":       "CursorStart",
@@ -474,17 +491,17 @@ conventions for text editing defaults.
     "PageDown":       "CursorPageDown",
     "CtrlPageUp":     "PreviousTab",
     "CtrlPageDown":   "NextTab",
-    "CtrlG":          "ToggleHelp",
+    "Ctrl-g":          "ToggleHelp",
     "Alt-g":          "ToggleKeyMenu",
-    "CtrlR":          "ToggleRuler",
-    "CtrlL":          "command-edit:goto ",
+    "Ctrl-r":          "ToggleRuler",
+    "Ctrl-l":          "command-edit:goto ",
     "Delete":         "Delete",
-    "CtrlB":          "ShellMode",
-    "CtrlQ":          "Quit",
-    "CtrlE":          "CommandMode",
-    "CtrlW":          "NextSplit",
-    "CtrlU":          "ToggleMacro",
-    "CtrlJ":          "PlayMacro",
+    "Ctrl-b":          "ShellMode",
+    "Ctrl-q":          "Quit",
+    "Ctrl-e":          "CommandMode",
+    "Ctrl-w":          "NextSplit",
+    "Ctrl-u":          "ToggleMacro",
+    "Ctrl-j":          "PlayMacro",
     "Insert":         "ToggleOverwriteMode",
 
     // Emacs-style keybindings
@@ -518,9 +535,110 @@ conventions for text editing defaults.
 }
 ```
 
+## Pane type bindings
+
+Keybindings can be specified for different pane types as well. For example, to
+make a binding that only affects the command bar, use the `command` subgroup:
+
+```
+{
+    "command": {
+        "Ctrl-w": "WordLeft"
+    }
+}
+```
+
+The possible pane types are `buffer` (normal buffer), `command` (command bar),
+and `terminal` (terminal pane). The defaults for the command and terminal panes
+are given below:
+
+```
+{
+    "terminal": {
+        "<Ctrl-q><Ctrl-q>": "Exit",
+        "<Ctrl-e><Ctrl-e>": "CommandMode",
+        "<Ctrl-w><Ctrl-w>": "NextSplit"
+    },
+
+    "command": {
+        "Up":             "HistoryUp",
+        "Down":           "HistoryDown",
+        "Right":          "CursorRight",
+        "Left":           "CursorLeft",
+        "ShiftUp":        "SelectUp",
+        "ShiftDown":      "SelectDown",
+        "ShiftLeft":      "SelectLeft",
+        "ShiftRight":     "SelectRight",
+        "AltLeft":        "StartOfTextToggle",
+        "AltRight":       "EndOfLine",
+        "AltUp":          "CursorStart",
+        "AltDown":        "CursorEnd",
+        "AltShiftRight":  "SelectWordRight",
+        "AltShiftLeft":   "SelectWordLeft",
+        "CtrlLeft":       "WordLeft",
+        "CtrlRight":      "WordRight",
+        "CtrlShiftLeft":  "SelectToStartOfTextToggle",
+        "ShiftHome":      "SelectToStartOfTextToggle",
+        "CtrlShiftRight": "SelectToEndOfLine",
+        "ShiftEnd":       "SelectToEndOfLine",
+        "CtrlUp":         "CursorStart",
+        "CtrlDown":       "CursorEnd",
+        "CtrlShiftUp":    "SelectToStart",
+        "CtrlShiftDown":  "SelectToEnd",
+        "Enter":          "ExecuteCommand",
+        "CtrlH":          "Backspace",
+        "Backspace":      "Backspace",
+        "OldBackspace":   "Backspace",
+        "Alt-CtrlH":      "DeleteWordLeft",
+        "Alt-Backspace":  "DeleteWordLeft",
+        "Tab":            "CommandComplete",
+        "Backtab":        "CycleAutocompleteBack",
+        "Ctrl-z":         "Undo",
+        "Ctrl-y":         "Redo",
+        "Ctrl-c":         "CopyLine|Copy",
+        "Ctrl-x":         "Cut",
+        "Ctrl-k":         "CutLine",
+        "Ctrl-v":         "Paste",
+        "Home":           "StartOfTextToggle",
+        "End":            "EndOfLine",
+        "CtrlHome":       "CursorStart",
+        "CtrlEnd":        "CursorEnd",
+        "Delete":         "Delete",
+        "Ctrl-q":         "AbortCommand",
+        "Ctrl-e":         "EndOfLine",
+        "Ctrl-a":         "StartOfLine",
+        "Ctrl-w":         "DeleteWordLeft",
+        "Insert":         "ToggleOverwriteMode",
+        "Ctrl-b":         "WordLeft",
+        "Ctrl-f":         "WordRight",
+        "Ctrl-d":         "DeleteWordLeft",
+        "Ctrl-m":         "ExecuteCommand",
+        "Ctrl-n":         "HistoryDown",
+        "Ctrl-p":         "HistoryUp",
+        "Ctrl-u":         "SelectToStart",
+
+        // Emacs-style keybindings
+        "Alt-f": "WordRight",
+        "Alt-b": "WordLeft",
+        "Alt-a": "StartOfText",
+        "Alt-e": "EndOfLine",
+
+        // Integration with file managers
+        "F10": "AbortCommand",
+        "Esc": "AbortCommand",
+
+        // Mouse bindings
+        "MouseWheelUp":   "HistoryUp",
+        "MouseWheelDown": "HistoryDown",
+        "MouseLeft":      "MousePress",
+        "MouseMiddle":    "PastePrimary"
+    }
+}
+```
+
 ## Final notes
 
-Note: On some old terminal emulators and on Windows machines, `CtrlH` should be
+Note: On some old terminal emulators and on Windows machines, `Ctrl-h` should be
 used for backspace.
 
 Additionally, alt keys can be bound by using `Alt-key`. For example `Alt-a` or

runtime/help/options.md

@@ -37,21 +37,45 @@ Here are the available options:
    closed cleanly. In the case of a system crash or a micro crash, the contents
    of the buffer can be recovered automatically by opening the file that was
    being edited before the crash, or manually by searching for the backup in
-   the backup directory. Backups are made in the background when a buffer is
-   modified and the latest backup is more than 8 seconds old, or when micro
-   detects a crash. It is highly recommended that you leave this feature
-   enabled.
+   the backup directory. Backups are made in the background for newly modified
+   buffers every 8 seconds, or when micro detects a crash.
 
     default value: `true`
 
+* `backupdir`: the directory micro should place backups in. For the default
+   value of `""` (empty string), the backup directory will be
+   `ConfigDir/backups`, which is `~/.config/micro/backups` by default. The
+   directory specified for backups will be created if it does not exist.
+
+    default value: `""` (empty string)
+
 * `basename`: in the infobar and tabbar, show only the basename of the file
    being edited rather than the full path.
 
     default value: `false`
 
+* `clipboard`: specifies how micro should access the system clipboard.
+   Possible values are:
+    * `external`: accesses clipboard via an external tool, such as xclip/xsel
+       or wl-clipboard on Linux, pbcopy/pbpaste on MacOS, and system calls on
+       Windows. On Linux, if you do not have one of the tools installed, or if
+       they are not working, micro will throw an error and use an internal
+       clipboard.
+    * `terminal`: accesses the clipboard via your terminal emulator. Note that
+       there is limited support among terminal emulators for this feature
+       (called OSC 52). Terminals that are known to work are Kitty (enable
+       reading with `clipboard_control` setting), iTerm2 (only copying),
+       st, rxvt-unicode and xterm if enabled (see `> help copypaste` for
+       details). Note that Gnome-terminal does not support this feature. With
+       this setting, copy-paste **will** work over ssh. See `> help copypaste`
+       for details.
+    * `internal`: micro will use an internal clipboard.
+
+    default value: `external`
+
 * `colorcolumn`: if this is not set to 0, it will display a column at the
-  specified column. This is useful if you want column 80 to be highlighted
-  special for example.
+   specified column. This is useful if you want column 80 to be highlighted
+   special for example.
 
 	default value: `0`
 
@@ -80,6 +104,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/.
 
@@ -102,12 +141,15 @@ Here are the available options:
 	default value: `false`
 
 * `fileformat`: this determines what kind of line endings micro will use for
-   the file. UNIX line endings are just `\n` (linefeed) whereas dos line
+   the file. Unix line endings are just `\n` (linefeed) whereas dos line
    endings are `\r\n` (carriage return + linefeed). The two possible values for
    this option are `unix` and `dos`. The fileformat will be automatically
    detected (when you open an existing file) and displayed on the statusline,
    but this option is useful if you would like to change the line endings or if
-   you are starting a new file.
+   you are starting a new file. Changing this option while editing a file will
+   change its line endings. Opening a file with this option set will only have
+   an effect if the file is empty/newly created, because otherwise the fileformat
+   will be automatically detected from the existing line endings.
 
 	default value: `unix`
 
@@ -163,7 +205,7 @@ Here are the available options:
 
 	default value: `true`
 
-* `paste`: Treat characters sent from the terminal in a single chunk as a paste
+* `paste`: treat characters sent from the terminal in a single chunk as a paste
    event rather than a series of manual key presses. If you are pasting using
    the terminal keybinding (not Ctrl-v, which is micro's default paste
    keybinding) then it is a good idea to enable this option during the paste
@@ -172,14 +214,30 @@ Here are the available options:
 
     default value: `false`
 
+* `parsecursor`: if enabled, this will cause micro to parse filenames such as
+   file.txt:10:5 as requesting to open `file.txt` with the cursor at line 10
+   and column 5. The column number can also be dropped to open the file at a
+   given line and column 0. Note that with this option enabled it is not possible
+   to open a file such as `file.txt:10:5`, where `:10:5` is part of the filename.
+   It is also possible to open a file with a certain cursor location by using the
+   `+LINE,COL` flag syntax. See `micro -help` for the command line options.
+
+    default value: `false`
+
+* `permbackup`: this option causes backups (see `backup` option) to be
+   permanently saved. With permanent backups, micro will not remove backups when
+   files are closed and will never apply them to existing files. Use this option
+   if you are interested in manually managing your backup files.
+
+    default value: `false`
+
 * `pluginchannels`: list of URLs pointing to plugin channels for downloading and
    installing plugins. A plugin channel consists of a json file with links to
    plugin repos, which store information about plugin versions and download URLs.
    By default, this option points to the official plugin channel hosted on GitHub
    at https://github.com/micro-editor/plugin-channel.
 
-    default value: `https://raw.githubusercontent.com/micro-editor/plugin-channel
-                    /master/channel.json`
+    default value: `https://raw.githubusercontent.com/micro-editor/plugin-channel/master/channel.json`
 
 * `pluginrepos`: a list of links to plugin repositories.
 
@@ -199,6 +257,12 @@ Here are the available options:
 
 	default value: `true`
 
+* `relativeruler`: make line numbers display relatively. If set to true, all lines except
+	for the line that the cursor is located will display the distance from the 
+	cursor's line. 
+
+	default value: `false` 
+
 * `savecursor`: remember where the cursor was last time the file was opened and
    put it there when you open the file again. Information is saved to
    `~/.config/micro/buffers/`
@@ -329,6 +393,83 @@ Any option you set in the editor will be saved to the file
 created for you. If you'd like to take your configuration with you to another
 machine, simply copy the settings.json to the other machine.
 
+## Settings.json file
+
+The settings.json file should go in your configuration directory (by default
+at `~/.config/micro`), and should contain only options which have been modified
+from their default setting. Here is the full list of options in json format,
+so that you can see what the formatting should look like.
+
+```json
+{
+    "autoclose": true,
+    "autoindent": true,
+    "autosave": 0,
+    "autosu": false,
+    "backup": true,
+    "backupdir": "",
+    "basename": false,
+    "clipboard": "external",
+    "colorcolumn": 0,
+    "colorscheme": "default",
+    "comment": true,
+    "cursorline": true,
+    "diff": true,
+    "diffgutter": false,
+    "divchars": "|-",
+    "divreverse": true,
+    "encoding": "utf-8",
+    "eofnewline": true,
+    "fastdirty": false,
+    "fileformat": "unix",
+    "filetype": "unknown",
+    "ftoptions": true,
+    "ignorecase": false,
+    "indentchar": " ",
+    "infobar": true,
+    "initlua": true,
+    "keepautoindent": false,
+    "keymenu": false,
+    "linter": true,
+    "literate": true,
+    "matchbrace": true,
+    "mkparents": false,
+    "mouse": true,
+    "parsecursor": false,
+    "paste": false,
+    "permbackup": false,
+    "pluginchannels": [
+        "https://raw.githubusercontent.com/micro-editor/plugin-channel/master/channel.json"
+    ],
+    "pluginrepos": [],
+    "readonly": false,
+    "relativeruler": false,
+    "rmtrailingws": false,
+    "ruler": true,
+    "savecursor": false,
+    "savehistory": true,
+    "saveundo": false,
+    "scrollbar": false,
+    "scrollmargin": 3,
+    "scrollspeed": 2,
+    "smartpaste": true,
+    "softwrap": false,
+    "splitbottom": true,
+    "splitright": true,
+    "status": true,
+    "statusformatl": "$(filename) $(modified)($(line),$(col)) $(status.paste)| ft:$(opt:filetype) | $(opt:fileformat) | $(opt:encoding)",
+    "statusformatr": "$(bind:ToggleKeyMenu): bindings, $(bind:ToggleHelp): help",
+    "statusline": true,
+    "sucmd": "sudo",
+    "syntax": true,
+    "tabmovement": false,
+    "tabsize": 4,
+    "tabstospaces": false,
+    "useprimary": true,
+    "xterm": false
+}
+```
+
 ## Global and local settings
 
 You can set these settings either globally or locally. Locally means that the

runtime/help/plugins.md

@@ -43,6 +43,12 @@ are called when certain events happen. Here is the list of callbacks
 which micro defines:
 
 * `init()`: this function should be used for your plugin initialization.
+   This function is called after buffers have been initialized.
+
+* `preinit()`: initialization function called before buffers have been
+   initialized.
+
+* `postinit()`: initialization function called after `init()`.
 
 * `onBufferOpen(buf)`: runs when a buffer is opened. The input contains
    the buffer object.
@@ -359,6 +365,12 @@ library documentation at https://golang.org/pkg/ (for the packages
 exposed to micro plugins). The Lua standard library is also available
 to plugins though it is rather small.
 
+The following functions are also available from the go-humanize package:
+
+The `humanize` package exposes:
+* `Bytes`
+* `Ordinal`
+
 ## Adding help files, syntax files, or colorschemes in your plugin
 
 You can use the `AddRuntimeFile(name string, type config.RTFiletype,
@@ -406,7 +418,7 @@ your own plugins.
 Micro also has a built in plugin manager which you can invoke with the
 `> plugin ...` command, or in the shell with `micro -plugin ...`.
 
-For the valid commands you can use, see the `command` help topic.
+For the valid commands you can use, see the `commands` help topic.
 
 The manager fetches plugins from the channels (which is simply a list of plugin
 metadata) which it knows about. By default, micro only knows about the official

runtime/help/tutorial.md

@@ -16,8 +16,8 @@ the settings and their values. To change an option, you can either change the
 value in the `settings.json` file, or you can type it in directly while using
 micro.
 
-Press CtrlE to go to command mode, and type `set option value` (in the
-future, I will use `> set option value` to indicate pressing CtrlE). The change
+Press Ctrl-e to go to command mode, and type `set option value` (in the
+future, I will use `> set option value` to indicate pressing Ctrl-e). The change
 will take effect immediately and will also be saved to the `settings.json` file
 so that the setting will stick even after you close micro.
 
@@ -48,12 +48,12 @@ If you would like to know more about all the available options, see the
 Keybindings work in much the same way as options. You configure them using the
 `~/.config/micro/bindings.json` file.
 
-For example if you would like to bind `CtrlR` to redo you could put the
+For example if you would like to bind `Ctrl-r` to redo you could put the
 following in `bindings.json`:
 
 ```json
 {
-    "CtrlR": "redo"
+    "Ctrl-r": "redo"
 }
 ```
 
@@ -74,7 +74,7 @@ micro starts and is essentially a one-file plugin. The plugin name is
 `initlua`.
 
 This example will show you how to use the `init.lua` file by creating a binding
-to `CtrlR` which will execute the bash command `go run` on the current file,
+to `Ctrl-r` which will execute the bash command `go run` on the current file,
 given that the current file is a Go file.
 
 You can do that by putting the following in `init.lua`:
@@ -84,9 +84,9 @@ local config = import("micro/config")
 local shell = import("micro/shell")
 
 function init()
-    -- true means overwrite any existing binding to CtrlR
+    -- true means overwrite any existing binding to Ctrl-r
     -- this will modify the bindings.json file
-    config.TryBindKey("CtrlR", "lua:initlua.gorun", true)
+    config.TryBindKey("Ctrl-r", "lua:initlua.gorun", true)
 end
 
 function gorun(bp)
@@ -104,7 +104,7 @@ the `bindings.json` file:
 
 ```json
 {
-    "CtrlR": "lua:initlua.gorun"
+    "Ctrl-r": "lua:initlua.gorun"
 }
 ```
 

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

runtime/plugins/comment/comment.lua

@@ -6,24 +6,59 @@ local buffer = import("micro/buffer")
 
 local ft = {}
 
+ft["apacheconf"] = "# %s"
+ft["bat"] = ":: %s"
 ft["c"] = "// %s"
 ft["c++"] = "// %s"
+ft["cmake"] = "# %s"
+ft["conf"] = "# %s"
+ft["crystal"] = "# %s"
+ft["css"] = "/* %s */"
+ft["d"] = "// %s"
+ft["dart"] = "// %s"
+ft["dockerfile"] = "# %s"
+ft["elm"] = "-- %s"
+ft["fish"] = "# %s"
+ft["gdscript"] = "# %s"
+ft["glsl"] = "// %s"
 ft["go"] = "// %s"
-ft["python"] = "# %s"
-ft["python3"] = "# %s"
+ft["haskell"] = "-- %s"
 ft["html"] = "<!-- %s -->"
+ft["ini"] = "; %s"
 ft["java"] = "// %s"
+ft["javascript"] = "// %s"
+ft["jinja2"] = "{# %s #}"
 ft["julia"] = "# %s"
+ft["kotlin"] = "// %s"
+ft["lua"] = "-- %s"
+ft["markdown"] = "<!-- %s -->"
+ft["nginx"] = "# %s"
+ft["nim"] = "# %s"
+ft["objc"] = "// %s"
+ft["ocaml"] = "(* %s *)"
+ft["pascal"] = "{ %s }"
 ft["perl"] = "# %s"
 ft["php"] = "// %s"
-ft["rust"] = "// %s"
-ft["shell"] = "# %s"
-ft["lua"] = "-- %s"
-ft["javascript"] = "// %s"
+ft["pony"] = "// %s"
+ft["powershell"] = "# %s"
+ft["proto"] = "// %s"
+ft["python"] = "# %s"
+ft["python3"] = "# %s"
 ft["ruby"] = "# %s"
-ft["d"] = "// %s"
+ft["rust"] = "// %s"
+ft["scala"] = "// %s"
+ft["shell"] = "# %s"
+ft["sql"] = "-- %s"
 ft["swift"] = "// %s"
-ft["elm"] = "-- %s"
+ft["tex"] = "% %s"
+ft["toml"] = "# %s"
+ft["twig"] = "{# %s #}"
+ft["v"] = "// %s"
+ft["xml"] = "<!-- %s -->"
+ft["yaml"] = "# %s"
+ft["zig"] = "// %s"
+ft["zscript"] = "// %s"
+ft["zsh"] = "# %s"
 
 function onBufferOpen(buf)
     if buf.Settings["commenttype"] == nil then
@@ -35,10 +70,38 @@ function onBufferOpen(buf)
     end
 end
 
+function isCommented(bp, lineN, commentRegex)
+    local line = bp.Buf:Line(lineN)
+    if string.match(line, commentRegex) then
+        return true
+    end
+    return false
+end
+
 function commentLine(bp, lineN)
     local line = bp.Buf:Line(lineN)
     local commentType = bp.Buf.Settings["commenttype"]
-    local commentRegex = "^%s*" .. commentType:gsub("%*", "%*"):gsub("%-", "%-"):gsub("%.", "%."):gsub("%+", "%+"):gsub("%]", "%]"):gsub("%[", "%["):gsub("%%s", "(.*)")
+    local sel = -bp.Cursor.CurSelection
+    local curpos = -bp.Cursor.Loc
+    local index = string.find(commentType, "%%s") - 1
+    local commentedLine = commentType:gsub("%%s", trim(line))
+    bp.Buf:Replace(buffer.Loc(0, lineN), buffer.Loc(#line, lineN), util.GetLeadingWhitespace(line) .. commentedLine)
+    if bp.Cursor:HasSelection() then
+        bp.Cursor.CurSelection[1].Y = sel[1].Y
+        bp.Cursor.CurSelection[2].Y = sel[2].Y
+        bp.Cursor.CurSelection[1].X = sel[1].X
+        bp.Cursor.CurSelection[2].X = sel[2].X
+    else
+        bp.Cursor.X = curpos.X + index
+        bp.Cursor.Y = curpos.Y
+    end
+    bp.Cursor:Relocate()
+    bp.Cursor.LastVisualX = bp.Cursor:GetVisualX()
+end
+
+function uncommentLine(bp, lineN, commentRegex)
+    local line = bp.Buf:Line(lineN)
+    local commentType = bp.Buf.Settings["commenttype"]
     local sel = -bp.Cursor.CurSelection
     local curpos = -bp.Cursor.Loc
     local index = string.find(commentType, "%%s") - 1
@@ -54,51 +117,63 @@ function commentLine(bp, lineN)
             bp.Cursor.X = curpos.X - index
             bp.Cursor.Y = curpos.Y
         end
-    else
-        local commentedLine = commentType:gsub("%%s", trim(line))
-        bp.Buf:Replace(buffer.Loc(0, lineN), buffer.Loc(#line, lineN), util.GetLeadingWhitespace(line) .. commentedLine)
-        if bp.Cursor:HasSelection() then
-            bp.Cursor.CurSelection[1].Y = sel[1].Y
-            bp.Cursor.CurSelection[2].Y = sel[2].Y
-            bp.Cursor.CurSelection[1].X = sel[1].X
-            bp.Cursor.CurSelection[2].X = sel[2].X
-        else
-            bp.Cursor.X = curpos.X + index
-            bp.Cursor.Y = curpos.Y
-        end
     end
     bp.Cursor:Relocate()
     bp.Cursor.LastVisualX = bp.Cursor:GetVisualX()
 end
 
-function commentSelection(bp, startLine, endLine)
+function toggleCommentLine(bp, lineN, commentRegex)
+    if isCommented(bp, lineN, commentRegex) then
+        uncommentLine(bp, lineN, commentRegex)
+    else
+        commentLine(bp, lineN)
+    end
+end
+
+function toggleCommentSelection(bp, startLine, endLine, commentRegex)
+    local allComments = true
     for line = startLine, endLine do
-        commentLine(bp, line)
+        if not isCommented(bp, line, commentRegex) then
+            allComments = false
+            break
+        end
+    end
+
+    for line = startLine, endLine do
+        if allComments then
+            uncommentLine(bp, line, commentRegex)
+        else
+            commentLine(bp, line)
+        end
     end
 end
 
 function comment(bp, args)
+    local commentType = bp.Buf.Settings["commenttype"]
+    local commentRegex = "^%s*" .. commentType:gsub("%%","%%%%"):gsub("%$","%$"):gsub("%)","%)"):gsub("%(","%("):gsub("%?","%?"):gsub("%*", "%*"):gsub("%-", "%-"):gsub("%.", "%."):gsub("%+", "%+"):gsub("%]", "%]"):gsub("%[", "%["):gsub("%%%%s", "(.*)"):gsub("%s+", "%s*")
+
     if bp.Cursor:HasSelection() then
         if bp.Cursor.CurSelection[1]:GreaterThan(-bp.Cursor.CurSelection[2]) then
             local endLine = bp.Cursor.CurSelection[1].Y
             if bp.Cursor.CurSelection[1].X == 0 then
                 endLine = endLine - 1
             end
-            commentSelection(bp, bp.Cursor.CurSelection[2].Y, endLine)
+            toggleCommentSelection(bp, bp.Cursor.CurSelection[2].Y, endLine, commentRegex)
         else
             local endLine = bp.Cursor.CurSelection[2].Y
             if bp.Cursor.CurSelection[2].X == 0 then
                 endLine = endLine - 1
             end
-            commentSelection(bp, bp.Cursor.CurSelection[1].Y, endLine)
+            toggleCommentSelection(bp, bp.Cursor.CurSelection[1].Y, endLine, commentRegex)
         end
     else
-        commentLine(bp, bp.Cursor.Y)
+        toggleCommentLine(bp, bp.Cursor.Y, commentRegex)
     end
 end
 
 function trim(s)
-    return (s:gsub("^%s*(.-)%s*$", "%1"))
+    local trimmed = s:gsub("^%s*(.-)%s*$", "%1"):gsub("%%","%%%%")
+    return trimmed
 end
 
 function string.starts(String,Start)
@@ -108,5 +183,6 @@ end
 function init()
     config.MakeCommand("comment", comment, config.NoComplete)
     config.TryBindKey("Alt-/", "lua:comment.comment", false)
+    config.TryBindKey("CtrlUnderscore", "lua:comment.comment", false)
     config.AddRuntimeFile("comment", config.RTHelp, "help/comment.md")
 end

runtime/plugins/comment/help/comment.md

@@ -1,8 +1,10 @@
 # Comment Plugin
 
 The comment plugin provides auto commenting/uncommenting.
-The default binding to comment/uncomment a line is `Alt-/`,
-but you can easily modify that in your `bindings.json` file:
+The default binding to comment/uncomment a line is `Alt-/`
+and `CtrlUnderscore`, which is equivalent in most terminals
+to `Ctrl-/`. You can easily modify that in your `bindings.json`
+file:
 
 ```json
 {
@@ -23,23 +25,58 @@ selected.
 The comment type will be auto detected based on the filetype,
 but it is only available for certain filetypes:
 
+* apacheconf: `# %s`
+* bat: `:: %s`
 * c: `// %s`
 * c++: `// %s`
+* cmake: `# %s`
+* conf: `# %s`
+* crystal: `# %s`
+* css: `/* %s */`
 * d: `// %s`
+* dart: `// %s`
+* dockerfile: `# %s`
+* elm: `-- %s`
+* fish: `# %s`
+* gdscript: `# %s`
+* glsl: `// %s`
 * go: `// %s`
+* haskell: `-- %s`
 * html: `<!-- %s -->`
+* ini: `; %s`
 * java: `// %s`
 * javascript: `// %s`
+* jinja2: `{# %s #}`
 * julia: `# %s`
+* kotlin: `// %s`
 * lua: `-- %s`
+* markdown: `<!-- %s -->`
+* nginx: `# %s`
+* nim: `# %s`
+* objc: `// %s`
+* pascal: `{ %s }`
 * perl: `# %s`
 * php: `// %s`
+* pony: `// %s`
+* powershell: `# %s`
+* proto: `// %s`
 * python: `# %s`
 * python3: `# %s`
 * ruby: `# %s`
 * rust: `// %s`
+* scala: `// %s`
 * shell: `# %s`
+* sql: `-- %s`
 * swift: `// %s`
+* tex: `% %s`
+* toml: `# %s`
+* twig: `{# %s #}`
+* v: `// %s`
+* xml: `<!-- %s -->`
+* yaml: `# %s`
+* zig: `// %s`
+* zscript: `// %s`
+* zsh: `# %s`
 
 If your filetype is not available here, you can simply modify
 the `commenttype` option:
@@ -57,4 +94,3 @@ Or in your `settings.json`:
     }
 }
 ```
-

runtime/plugins/linter/help/linter.md

@@ -9,8 +9,10 @@ following filetypes and linters:
 * c++: g++
 * d: dmd
 * go: go build
+* haskell: hlint
 * java: javac
 * javascript: jshint
+* javascript: eslint
 * literate: lit
 * lua: luacheck
 * nim: nim
@@ -19,7 +21,7 @@ following filetypes and linters:
 * python: mypy
 * python: pylint
 * shell: shfmt
-* swift: swiftc
+* swift: swiftc (MacOS and Linux only)
 * yaml: yamllint
 
 If the linter plugin is enabled and the file corresponds to one of
@@ -64,17 +66,17 @@ Below is an example for including a linter for any filetype using
 the `misspell` linter which checks for misspelled words in a file.
 
 ```lua
-local config = import("micro/config")
-
-config.RegisterCommonOption("misspell", true)
-
 function init()
     -- uses the default linter plugin
     -- matches any filetype
-    linter.makeLinter("misspell", "", "misspell", {"%f"}, "%f:%l:%c: %m", {}, false, true, 0, 0, hasMisspell)
-end
-
-function hasMisspell(buf)
-    return buf.Settings["misspell"]
+    linter.makeLinter("misspell", "", "misspell", {"%f"}, "%f:%l:%c: %m", {}, false, true)
+end
+```
+
+Here is an example for a more typical use-case, where the linter will only match one filetype (C in this case):
+
+```lua
+function init()
+    linter.makeLinter("gcc", "c", "gcc", {"-fsyntax-only", "-Wall", "-Wextra", "%f"}, "%f:%l:%c:.+: %m")
 end
 ```

runtime/plugins/linter/linter.lua

@@ -59,7 +59,7 @@ function removeLinter(name)
     linters[name] = nil
 end
 
-function init()
+function preinit()
     local devnull = "/dev/null"
     if runtime.GOOS == "windows" then
         devnull = "NUL"
@@ -68,6 +68,7 @@ function init()
     makeLinter("gcc", "c", "gcc", {"-fsyntax-only", "-Wall", "-Wextra", "%f"}, "%f:%l:%c:.+: %m")
     makeLinter("g++", "c++", "gcc", {"-fsyntax-only","-std=c++14", "-Wall", "-Wextra", "%f"}, "%f:%l:%c:.+: %m")
     makeLinter("dmd", "d", "dmd", {"-color=off", "-o-", "-w", "-wi", "-c", "%f"}, "%f%(%l%):.+: %m")
+    makeLinter("eslint", "javascript", "eslint", {"-f","compact","%f"}, "%f: line %l, col %c, %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")
@@ -80,9 +81,10 @@ function init()
     makeLinter("pyflakes", "python", "pyflakes", {"%f"}, "%f:%l:.-:? %m")
     makeLinter("mypy", "python", "mypy", {"%f"}, "%f:%l: %m")
     makeLinter("pylint", "python", "pylint", {"--output-format=parseable", "--reports=no", "%f"}, "%f:%l: %m")
+    makeLinter("flake8", "python", "flake8", {"%f"}, "%f:%l:%c: %m")
     makeLinter("shfmt", "shell", "shfmt", {"%f"}, "%f:%l:%c: %m")
     makeLinter("swiftc", "swift", "xcrun", {"swiftc", "%f"}, "%f:%l:%c:.+: %m", {"darwin"}, true)
-    makeLinter("swiftc", "swiftc", {"%f"}, "%f:%l:%c:.+: %m", {"linux"}, true)
+    makeLinter("swiftc", "swift", "swiftc", {"%f"}, "%f:%l:%c:.+: %m", {"linux"}, true)
     makeLinter("yaml", "yaml", "yamllint", {"--format", "parsable", "%f"}, "%f:%l:%c:.+ %m")
 
     config.MakeCommand("lint", function(bp, args)
@@ -166,7 +168,6 @@ function onExit(output, args)
             elseif col == nil then
                 hascol = false
             end
-            micro.Log(basename(buf.Path), basename(file))
             if basename(buf.Path) == basename(file) then
                 local bmsg = nil
                 if hascol then

runtime/plugins/status/help/status.md

@@ -6,10 +6,14 @@ Using the `statusformatl` and `statusformatr` options, the exact contents
 of the status line can be modified. Please see the documentation for
 those options (`> help options`) for more information.
 
-This plugin provides the three functions that can be used in the status
-line format:
+This plugin provides functions that can be used in the status line format:
 
 * `status.branch`: returns the name of the current git branch.
 * `status.hash`: returns the hash of the current git commit.
 * `status.paste`: returns "" if the paste option is disabled and "PASTE"
    if it is enabled.
+* `status.lines`: returns the number of lines in the buffer.
+* `status.vcol`: returns the visual column number of the cursor.
+* `status.bytes`: returns the number of bytes in the current buffer.
+* `status.size`: returns the size of the current buffer in a human-readable
+   format.

runtime/plugins/status/status.lua

@@ -3,14 +3,35 @@ VERSION = "1.0.0"
 local micro = import("micro")
 local buffer = import("micro/buffer")
 local config = import("micro/config")
+local humanize = import("humanize")
 
 function init()
     micro.SetStatusInfoFn("status.branch")
     micro.SetStatusInfoFn("status.hash")
     micro.SetStatusInfoFn("status.paste")
+    micro.SetStatusInfoFn("status.vcol")
+    micro.SetStatusInfoFn("status.lines")
+    micro.SetStatusInfoFn("status.bytes")
+    micro.SetStatusInfoFn("status.size")
     config.AddRuntimeFile("status", config.RTHelp, "help/status.md")
 end
 
+function lines(b)
+    return tostring(b:LinesNum())
+end
+
+function vcol(b)
+    return tostring(b:GetActiveCursor():GetVisualX())
+end
+
+function bytes(b)
+    return tostring(b:Size())
+end
+
+function size(b)
+    return humanize.Bytes(b:Size())
+end
+
 function branch(b)
     if b.Type.Kind ~= buffer.BTInfo then
         local shell = import("micro/shell")

runtime/syntax/c.yaml

@@ -12,9 +12,6 @@ rules:
     - statement: "\\b(for|if|while|do|else|case|default|switch)\\b"
     - statement: "\\b(goto|continue|break|return)\\b"
     - preproc: "^[[:space:]]*#[[:space:]]*(define|pragma|include|(un|ifn?)def|endif|el(if|se)|if|warning|error)"
-    - constant: "'([^'\\\\]|(\\\\[\"'abfnrtv\\\\]))'"
-    - constant: "'\\\\(([0-3]?[0-7]{1,2}))'"
-    - constant: "'\\\\x[0-9A-Fa-f]{1,2}'"
       # GCC builtins
     - statement: "__attribute__[[:space:]]*\\(\\([^)]*\\)\\)"
     - statement: "__(aligned|asm|builtin|hidden|inline|packed|restrict|section|typeof|weak)__"
@@ -29,15 +26,15 @@ rules:
         end: "\""
         skip: "\\\\."
         rules:
-            - constant.specialChar: "\\\\."
+            - constant.specialChar: "\\\\([\"'abfnrtv\\\\]|[0-3]?[0-7]{1,2}|x[0-9A-Fa-f]{1,2}|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})"
 
     - constant.string:
         start: "'"
         end: "'"
         skip: "\\\\."
         rules:
-            - preproc: "..+"
-            - constant.specialChar: "\\\\."
+            - error: "..+"
+            - constant.specialChar: "\\\\([\"'abfnrtv\\\\]|[0-3]?[0-7]{1,2}|x[0-9A-Fa-f]{1,2}|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})"
 
     - comment:
         start: "//"

runtime/syntax/coffeescript.yaml

@@ -4,19 +4,32 @@ detect:
     filename: "\\.coffee$"
 
 rules:
-    - symbol.operator: "[!&|=/*+-<>]|\\b(and|or|is|isnt|not)\\b"
+    - symbol.operator: "([-+/*=<>!~%?:&|]|[.]{3})|\\b(and|or|is|isnt|not)\\b"
     - identifier.class: "([A-Za-z_][A-Za-z0-9_]*:[[:space:]]*(->|\\()|->)"
     - symbol.brackets: "[()]"
-    - statement:  "\\b(for|of|continue|break|isnt|null|unless|this|else|if|return)\\b"
-    - statement:  "\\b(try|catch|finally|throw|new|delete|typeof|in|instanceof)\\b"
-    - statement:  "\\b(debugger|switch|while|do|class|extends|super)\\b"
-    - statement:  "\\b(undefined|then|unless|until|loop|of|by|when)\\b"
+
+    - statement:  "\\b(await|when|catch|continue|debugger|default|by|until)\\b"
+    - statement:  "\\b(delete|do|else|export|finally|for|class|extends|while|then)\\b"
+    - statement:  "\\b(get|if|import|from|in|instanceof|new|reject|resolve|return)\\b"
+    - statement:  "\\b(set|super|switch|this|throw|try|typeof|with|yield|unless)\\b"
+
     - constant.bool:  "\\b(true|false|yes|no|on|off)\\b"
+    - constant.bool.false: "\\b(false|no|off)\\b"
+    - constant.bool.true: "\\b(true|yes|on)\\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_]*"
 
+    - error: "\\b(enum|implements|interface|package|private|protected|public)"
+    - constant: "\\b(globalThis|Infinity|null|undefined|NaN)\\b"
+    - constant: "\\b(null|undefined|NaN)\\b"
+    - constant: "\\b(true|false|yes|no|on|off)\\b"
+    - type: "\\b(Array|Boolean|Date|Enumerator|Error|Function|Generator|Map|Math)\\b"
+    - type: "\\b(Number|Object|Promise|Proxy|Reflect|RegExp|Set|String|Symbol|WeakMap|WeakSet)\\b"
+    - type: "\\b(BigInt64Array|BigUint64Array|Float32Array|Float64Array|Int16Array)\\b"
+
     - constant.string:
         start: "\""
         end: "\""
@@ -30,16 +43,14 @@ rules:
         skip: "\\\\."
         rules:
             - constant.specialChar: "\\\\."
-      
+
+    - comment:
+        start: "###"
+        end: "###"
+        rules:  []
 
     - comment:
         start: "#"
         end: "$"
         rules:
             - todo: "(TODO|XXX|FIXME):?"
-    - comment:
-        start: "###"
-        end: "###"
-        rules:  
-            - todo: "(TODO|XXX|FIXME)"
-

runtime/syntax/cpp.yaml

@@ -4,42 +4,51 @@ 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"
+    - identifier: "\\b[A-Z_][0-9A-Z_]*\\b"
+    - type: "\\b(float|double|bool|char|int|short|long|enum|void|struct|union|typedef|(un)?signed|inline)\\b"
+    - type: "\\b(((s?size)|((u_?)?int(8|16|32|64|ptr))|char(8|16|32))_t|wchar_t)\\b"
+    - type: "\\b(final|override)\\b"
+    - type.keyword: "\\b(auto|volatile|const(expr|eval|init)?|mutable|register|thread_local|static|extern|decltype|explicit|virtual)\\b"
+    - statement: "\\b(class|namespace|template|typename|this|friend|using|public|protected|private|noexcept)\\b"
+    - statement: "\\b(concept|requires)\\b"
+    - statement: "\\b(import|export|module)\\b"
     - statement: "\\b(for|if|while|do|else|case|default|switch)\\b"
-    - statement: "\\b(try|throw|catch|operator|new|delete)\\b"
+    - statement: "\\b(try|throw|catch|operator|new|delete|static_assert)\\b"
     - statement: "\\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}')"
+    - preproc: "^[[:space:]]*#[[:space:]]*(define|pragma|include|(un|ifn?)def|endif|el(if|se)|if|warning|error)|_Pragma"
+
+      # Conditionally-supported/extension keywords
+    - statement: "\\b(asm|fortran)\\b"
 
       # GCC builtins
     - statement: "(__attribute__[[:space:]]*\\(\\([^)]*\\)\\)|__(aligned|asm|builtin|hidden|inline|packed|restrict|section|typeof|weak)__)"
 
       # Operator Color
-    - symbol.operator: "([.:;,+*|=!\\%]|<|>|/|-|&)" 
+    - symbol.operator: "[-+*/%=<>.:;,~&|^!?]|\\b(sizeof|alignof|typeid|(and|or|xor|not)(_eq)?|bitor|compl|bitand|(const|dynamic|reinterpret|static)_cast)\\b"
       # Parenthetical Color
     - symbol.brackets: "[(){}]|\\[|\\]"
-
-    - constant.number: "(\\b[0-9]+\\b|\\b0x[0-9A-Fa-f]+\\b)"
-    - constant.bool: "(\\b(true|false)\\b|NULL)"
+      # Integer Literals
+    - constant.number: "(\\b([1-9][0-9']*|0[0-7']*|0[Xx][0-9a-fA-F']+|0[Bb][01]+)([Uu]?[Ll][Ll]?|[Ll][Ll]?[Uu]?)?\\b)"
+      # Decimal Floating-point Literals
+    - constant.number: "(\\b(([0-9']*[.][0-9']+|[0-9']+[.][0-9']*)([Ee][+-]?[0-9']+)?|[0-9']+[Ee][+-]?[0-9']+)[FfLl]?\\b)"
+      # Hexadecimal Floating-point Literals
+    - constant.number: "(\\b0[Xx]([0-9a-zA-Z']*[.][0-9a-zA-Z']+|[0-9a-zA-Z']+[.][0-9a-zA-Z']*)[Pp][+-]?[0-9']+[FfLl]?\\b)"
+    - constant.bool: "(\\b(true|false|NULL|nullptr)\\b)"
 
     - constant.string:
         start: "\""
         end: "\""
         skip: "\\\\."
         rules:
-            - constant.specialChar: "\\\\."
+            - constant.specialChar: "\\\\([\"'abfnrtv\\\\]|[0-3]?[0-7]{1,2}|x[0-9A-Fa-f]{1,2}|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})"
 
     - constant.string:
         start: "'"
         end: "'"
         skip: "\\\\."
         rules:
-            - preproc: "..+"
-            - constant.specialChar: "\\\\."
+            - error: "..+"
+            - constant.specialChar: "\\\\([\"'abfnrtv\\\\]|[0-3]?[0-7]{1,2}|x[0-9A-Fa-f]{1,2}|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})"
 
     - comment:
         start: "//"

runtime/syntax/crontab.yaml

@@ -14,16 +14,16 @@ rules:
       #              month          0-12 (or names, see below)
       #              day of week    0-7 (0 or 7 is Sun, or use names)
 
-    - statement: "^([\\*0-9,\\-\\/]+)\\s+([\\*0-9,\\-\\/]+)\\s+([\\*0-9,\\-\\/]+)\\s+([\\*0-9,\\-\\/]+)\\s+([\\*0-9,\\-\\/]+)\\s+(.*)$\\n?"
-    - constant: "^([\\*0-9,\\-\\/]+)\\s+([\\*0-9,\\-\\/]+)\\s+([\\*0-9,\\-\\/]+)\\s+([\\*0-9,\\-\\/]+)\\s+([\\*0-9,\\-\\/]+)"
+    - statement: "^([\\*0-9,\\-\\/]+)\\s+([\\*0-9,\\-\\/]+)\\s+([\\*0-9,\\-\\/]+)\\s+(([\\*0-9,\\-\\/]+)|(\\b(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)\\b))\\s+(([\\*0-9,\\-\\/]+)|(\\b(sun|mon|tue|wed|thu|fri|sat)\\b))\\s+(.*)$\\n?"
+    - constant:  "^([\\*0-9,\\-\\/]+)\\s+([\\*0-9,\\-\\/]+)\\s+([\\*0-9,\\-\\/]+)\\s+(([\\*0-9,\\-\\/]+)|(\\b(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)\\b))\\s+(([\\*0-9,\\-\\/]+)|(\\b(sun|mon|tue|wed|thu|fri|sat)\\b))"
     
       # Shell Values
     - type: "^[A-Z]+\\="
 
       # Months and weekday keywords
-    - type: "jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec"
-    - constant: "sun|mon|tue|wed|thu|fri|sat"
-    - type: "\\@(reboot|yearly|annually|monthly|weekly|daily|midnight|hourly)"
+    - constant: "\\b(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)\\b"
+    - constant: "\\b(sun|mon|tue|wed|thu|fri|sat)\\b"
+    - type: "\\@(reboot|yearly|annually|monthly|weekly|daily|midnight|hourly)\\b"
 
       # Conditionals
     - special: "(\\{|\\}|\\(|\\)|\\;|\\]|\\[|`|\\\\|\\$|<|>|^|!|=|&|\\|)"

runtime/syntax/crystal.yaml

@@ -5,10 +5,14 @@ detect:
 
 rules:
     # Asciibetical list of reserved words
-    - statement: "\\b(BEGIN|END|abstract|alias|and|begin|break|case|class|def|defined\\?|do|else|elsif|end|ensure|enum|false|for|fun|if|in|include|lib|loop|macro|module|next|nil|not|of|or|pointerof|private|protected|raise|redo|require|rescue|retry|return|self|sizeof|spawn|struct|super|then|true|type|undef|union|uninitialized|unless|until|when|while|yield)\\b"
+    - statement: "\\b(abstract|alias|as|asm|begin|break|case|class|def|do|else|elsif|end|ensure|enum|extend|for|fun|if|in|include|instance_sizeof|lib|loop|macro|module|next|of|out|pointerof|private|protected|raise|require|rescue|return|select|self|sizeof|spawn|struct|super|then|type|typeof|uninitialized|union|unless|until|verbatim|when|while|with|yield)\\b"
       # Constants
-    - constant: "(\\$|@|@@)?\\b[A-Z]+[0-9A-Z_a-z]*"
+    - constant: "\\b(true|false|nil)\\b"
     - constant.number: "\\b[0-9]+\\b"
+      # Ones that can't be in the same regex because they include non-words.
+      # The nil? one has to be after the constants.
+    - statement: "\\b(nil\\?|as(\\?|\\b)|is_a\\?|responds_to\\?)"
+    - type: "(\\$|@|@@)?\\b[A-Z]+[0-9A-Z_a-z]*"
       # Crystal "symbols"
     - constant:  "([ 	]|^):[0-9A-Z_]+\\b"
       # Some unique things we want to stand out

runtime/syntax/groovy.yaml

@@ -0,0 +1,113 @@
+filetype: groovy
+
+detect:
+    filename: "\\.(groovy|gy|gvy|gsh|gradle)$"
+    header: "^#!.*/(env +)?groovy *$"
+
+rules:
+    # And the style guide for constants is CONSTANT_CASE
+    - identifier: "\\b[A-Z_$]+\\b"
+    # The style guide for JVM languages is PascalCase for classes and interfaces
+    - identifier.class: "\\b[A-Z][a-zA-Z0-9$]+\\b"
+    
+    # Primitive types
+    - type: "\\b(byte|short|int|long|float|double|char|boolean|void)\\b"
+    
+    # Type-related keywords
+    - type.keyword: "\\b(private|public|protected|static|final|var|def)\\b"
+    
+    # Keywords
+    - statement: "\\b(for|while|do|if|else|switch|case|default|try|catch|finally)\\b"
+    - statement: "\\b(break|continue|return|throw|assert)\\b"
+    - statement: "\\b(package|import|class|interface|trait|enum|extends|implements|throws)\\b"
+    - statement: "\\b(this|super)\\b"
+    # Unsused, but reserved keywords
+    - statement: "\\b(goto|const)\\b"
+    
+    # Operators and punctuation
+    - symbol.operator: "[-+*/%=<>^~&|!?:;,.@]|\\b(in|is|as|instanceof|new)\\b"
+    - symbol.brackets: "[(){}]|\\[|\\]"
+    
+    # Decimal integer literal
+    - constant.number: "(?i)\\b[1-9]([_0-9]*[0-9])?[GLIDF]?\\b"
+    # Binary integer literal
+    - constant.number: "(?i)\\b0b[01]([01_]*[01])?[GLIDF]?\\b"
+    # Octal integer literal
+    - constant.number: "(?i)\\b0[0-7]([0-7_]*[0-7])?[GLIDF]?\\b"
+    # Hexadecimal integer literal
+    - constant.number: "(?i)\\b0x[0-9a-f]([0-9a-f_]*[0-9a-f])?[GLIDF]?\\b"
+    # Floating-point literal
+    - constant.number: "(?i)\\b[0-9]([0-9_]*[0-9])?([.][0-9]([0-9_]*[0-9])?)?(e[+-]?[0-9]([0-9_]*[0-9])?)?[DF]?\\b"
+    - constant.bool: "\\b(true|false|null)\\b"
+    
+    # Annotations
+    - identifier: "@[A-Za-z_$][A-Za-z0-9_$]*\\b"
+    
+    # Single-quoted strings
+    - constant.string:
+        start: "'"
+        end: "'"
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\([\"'bfnrst\\x24\\\\]|u[a-fA-F0-9]{4})"
+    
+    # This also matches the Triple-double-quoted strings region, but I can't really find a way to mitigate it, all the while still matching "" as a string correctly
+    # Also, nesting ${} are never going to be matched correctly with just regex either, so highlighting will break if one is to nest interpolation
+    # These two problems combined mean slight mistakes in highlighing that the user is just going to have to deal with
+    # Double-quoted strings
+    - constant.string:
+        start: "\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\([\"'bfnrst\\x24\\\\]|u[a-fA-F0-9]{4})"
+            - identifier.var: "\\x24[\\w\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF\u0100-\uFFFE]+([.][a-zA-Z0-9_\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF\u0100-\uFFFE]+)*"
+            - identifier: "\\x24[{].*[}]"
+    
+    # Triple-double-quoted strings
+    - constant.string:
+        start: "\"\"\""
+        end: "\"\"\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\([\"'bfnrst\\x24\\\\]|u[a-fA-F0-9]{4})"
+            - identifier.var: "\\x24[\\w\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF\u0100-\uFFFE]+([.][a-zA-Z0-9_\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF\u0100-\uFFFE]+)*"
+            - identifier:
+                start: "[$][{]"
+                end: "[}]"
+                rules: []
+    
+    # Triple-single-quoted strings
+    - constant.string:
+        start: "'''"
+        end: "'''"
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\([\"'bfnrst\\x24\\\\]|u[a-fA-F0-9]{4})"
+    
+    # Slashy strings are left out, because they match in unwanted places pretty much all the time
+    # Dollar-slashy strings
+    - constant.string:
+        start: "[$]/"
+        end: "/[$]"
+        rules: []
+    
+    # Single-line comments
+    - comment:
+        start: "//"
+        end: "$"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+    
+    # Multiline comments
+    - comment:
+        start: "/[*]"
+        end: "[*]/"
+        rules:
+            - todo: "(TODO|XXX|FIXME):?"
+    
+    # Groovydoc comments
+    - comment:
+        start: "/[*][*]@?"
+        end: "[*]/"
+        rules: []

runtime/syntax/haskell.yaml

@@ -5,9 +5,7 @@ detect:
 
 rules:
     # Keywords
-    - statement: "[ ](as|case|of|class|data|default|deriving|do|forall|foreign|hiding|if|then|else|import|infix|infixl|infixr|instance|let|in|mdo|module|newtype|qualified|type|where)[ ]"
-    - statement: "(^data|^foreign|^import|^infix|^infixl|^infixr|^instance|^module|^newtype|^type)[ ]"
-    - statement: "[ ](as$|case$|of$|class$|data$|default$|deriving$|do$|forall$|foreign$|hiding$|if$|then$|else$|import$|infix$|infixl$|infixr$|instance$|let$|in$|mdo$|module$|newtype$|qualified$|type$|where$)"
+    - statement: "\\b(as|case|of|class|data|default|deriving|do|forall|foreign|hiding|if|then|else|import|infix|infixl|infixr|instance|let|in|mdo|module|newtype|qualified|type|where)\\b"
 
       # Various symbols
     - symbol: "(\\||@|!|:|_|~|=|\\\\|;|\\(\\)|,|\\[|\\]|\\{|\\})"

runtime/syntax/javascript.yaml

@@ -20,7 +20,7 @@ rules:
     - statement: "\\b(async|await|break|case|catch|const|continue|debugger|default)\\b"
     - statement: "\\b(delete|do|else|export|finally|for|function\\*?|class|extends)\\b"
     - statement: "\\b(get|if|import|from|in|of|instanceof|let|new|reject|resolve|return)\\b"
-    - statement: "\\b(set|super|switch|this|throw|try|typeof|var|void|while|with|yield)\\b"
+    - statement: "\\b(set|static|super|switch|this|throw|try|typeof|var|void|while|with|yield)\\b"
     # reserved but unassigned
     - error: "\\b(enum|implements|interface|package|private|protected|public)"
     - constant: "\\b(globalThis|Infinity|null|undefined|NaN)\\b"

runtime/syntax/julia.yaml

@@ -33,11 +33,16 @@ rules:
         rules: []
 
     - constant.string:
-        start: "'''"
-        end: "'''"
+        start: "\"[^\"]|\"$"
+        end: "\""
         rules: []
 
     - comment:
-        start: "#"
+        start: "#[^=]|#$"
         end: "$"
         rules: []
+
+    - comment:
+        start: "#="
+        end: "=#"
+        rules: []

runtime/syntax/php.yaml

@@ -12,7 +12,6 @@ rules:
     - special: "&[^;[[:space:]]]*;"
     - symbol: "[:=]"
     - identifier: "(alt|bgcolor|height|href|label|longdesc|name|onclick|onfocus|onload|onmouseover|size|span|src|style|target|type|value|width)="
-    - constant.string: "\"[^\"]*\""
     - constant.number: "(?i)#[0-9A-F]{6,6}"
     - constant.string.url: "(ftp(s)?|http(s)?|git|chrome)://[^ 	]+"
     - comment: "<!--.+?-->"
@@ -33,8 +32,12 @@ rules:
     - symbol.operator: "(=>|===|!==|==|!=|&&|\\|\\||::|=|->|\\!)"
     - identifier.var: "(\\$[a-zA-Z0-9\\-_]+)"
     - symbol.operator: "[\\(|\\)|/|+|\\-|\\*|\\[|.|,|;]"
-    - constant.string: "\"(\\\\.|[^\"])*\"|'(\\\\.|[^'])*'"
-    - constant.specialChar: "\\\\[abfnrtv'\\\"\\\\]"
+    - constant.string:
+        start: "\""
+        end: "\""
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\[abfnrtv'\\\"\\\\]"
     - symbol.brackets: "(\\[|\\]|\\{|\\}|[()])"
     - comment: "(^|[[:space:]])//.*"
     - comment: "(^|[[:space:]])#.*"

runtime/syntax/python3.yaml

@@ -6,27 +6,30 @@ detect:
 
 rules:
     # built-in objects
-    - constant: "\\b(Ellipsis|None|self|True|False)\\b"
+    - constant: "\\b(Ellipsis|None|self|cls|True|False)\\b"
       # built-in attributes
     - constant: "\\b(__bases__|__builtin__|__class__|__debug__|__dict__|__doc__|__file__|__members__|__methods__|__name__|__self__)\\b"
       # built-in functions
     - identifier: "\\b(abs|all|any|ascii|bin|bool|breakpoint|bytearray|bytes|callable|chr|classmethod|compile|complex|delattr|dir|divmod|eval|exec|format|getattr|globals|hasattr|hash|help|hex|id|input|isinstance|issubclass|iter|len|locals|max|min|next|nonlocal|oct|open|ord|pow|print|repr|round|setattr|sorted|sum|vars|__import__)\\b"
       # special method names
-    - identifier: "\\b(__abs__|__add__|__and__|__call__|__cmp__|__coerce__|__complex__|__concat__|__contains__|__del__|__delattr__|__delitem__|__delslice__|__div__|__divmod__|__float__|__getattr__|__getitem__|__getslice__|__hash__|__hex__|__init__|__int__|__inv__|__invert__|__len__|__dict__|__long__|__lshift__|__mod__|__mul__|__neg__|__next__|__nonzero__|__oct__|__or__|__pos__|__pow__|__radd__|__rand__|__rcmp__|__rdiv__|__rdivmod__|__repeat__|__repr__|__rlshift__|__rmod__|__rmul__|__ror__|__rpow__|__rrshift__|__rshift__|__rsub__|__rxor__|__setattr__|__setitem__|__setslice__|__str__|__sub__|__xor__)\\b"
+    - identifier: "\\b__(abs|add|and|call|cmp|coerce|complex|concat|contains|delattr|delitem|delslice|del|dict|divmod|div|float|getattr|getitem|getslice|hash|hex|iadd|iand|iconcat|ifloordiv|ilshift|imatmul|imod|imul|init|int|invert|inv|ior|ipow|irshift|isub|iter|itruediv|ixor|len|long|lshift|mod|mul|neg|next|nonzero|oct|or|pos|pow|radd|rand|rcmp|rdivmod|rdiv|repeat|repr|rlshift|rmod|rmul|ror|rpow|rrshift|rshift|rsub|rxor|setattr|setitem|setslice|str|sub|xor)__\\b"
       # types
     - type: "\\b(bool|bytearray|bytes|classmethod|complex|dict|enumerate|filter|float|frozenset|int|list|map|memoryview|object|property|range|reversed|set|slice|staticmethod|str|super|tuple|type|zip)\\b"
       # definitions
     - identifier: "def [a-zA-Z_0-9]+"
       # keywords
-    - statement: "\\b(and|as|assert|await|break|class|continue|def|del|elif|else|except|finally|for|from|global|if|import|in|is|lambda|nonlocal|not|or|pass|raise|return|try|while|with|yield)\\b"
+    - statement: "\\b(and|as|assert|async|await|break|class|continue|def|del|elif|else|except|finally|for|from|global|if|import|in|is|lambda|nonlocal|not|or|pass|raise|return|try|while|with|yield)\\b"
       # decorators
     - brightgreen: "@.*[(]"
       # operators
-    - symbol.operator: "([.:;,+*|=!\\%@]|<|>|/|-|&)"
+    - symbol.operator: "([~^.:;,+*|=!\\%@]|<|>|/|-|&)"
       # parentheses
     - symbol.brackets: "([(){}]|\\[|\\])"
       # numbers
-    - constant.number: "\\b[0-9]+\\b"
+    - constant.number: "\\b[1-9](_?[0-9])*(\\.([0-9](_?[0-9])*)?)?(e[0-9](_?[0-9])*)?\\b" # decimal
+    - constant.number: "\\b0b(_?[01])+\\b"     # bin
+    - constant.number: "\\b0o(_?[0-7])+\\b"    # oct
+    - constant.number: "\\b0x(_?[0-9a-f])+\\b" # hex
 
     - constant.string:
         start: "\"\"\""
@@ -40,14 +43,14 @@ rules:
 
     - constant.string:
         start: "\""
-        end: "\""
+        end: "(\"|$)"
         skip: "\\\\."
         rules:
             - constant.specialChar: "\\\\."
 
     - constant.string:
         start: "'"
-        end: "'"
+        end: "('|$)"
         skip: "\\\\."
         rules:
             - constant.specialChar: "\\\\."
@@ -55,5 +58,5 @@ rules:
     - comment:
         start: "#"
         end: "$"
-        rules: []
-
+        rules:  # AKA Code tags (PEP 350)
+            - todo: "(TODO|FIXME|HACK|BUG|NOTE|FAQ|MNEMONIC|REQ|RFE|IDEA|PORT|\\?\\?\\?|!!!|GLOSS|SEE|TODOC|STAT|RVD|CRED):?"

runtime/syntax/renpy.yaml

@@ -0,0 +1,15 @@
+filetype: renpy
+
+detect:
+    filename: "\\.rpy$"
+
+rules:
+    # Script language keywords.
+    - statement: "\\b(python|init|early|define|default|label|call|jump|image|layeredimage|screen|style|transform|menu|show|hide|scene|at|with|zorder|behind|pause|play|stop|fadeout|fadein|queue)\\b"
+    # ATL keywords.
+    - type: "\\b(repeat|block|choice|parallel|(x|y|)(pos|offset|anchor|align|center|tile|zoom)|time|linear|easein|alpha|subpixel)\\b"
+    - identifier: "\\bpersistent\\b"
+    - special: "\\$ "
+    # Tab characters are not allowed in Renpy scripts.
+    - error: "\\t"
+    - include: python

runtime/syntax/rust.yaml

@@ -7,15 +7,19 @@ rules:
     # function definition
     - identifier: "fn [a-z0-9_]+"
       # Reserved words
-    - statement: "\\b(abstract|alignof|as|become|box|break|const|continue|crate|do|else|enum|extern|false|final|fn|for|if|impl|in|let|loop|macro|match|mod|move|mut|offsetof|override|priv|pub|pure|ref|return|sizeof|static|self|struct|super|true|trait|type|typeof|unsafe|unsized|use|virtual|where|while|yield)\\b"
+    - statement: "\\b(abstract|alignof|as|become|box|break|const|continue|crate|do|dyn|else|enum|extern|false|final|fn|for|if|impl|in|let|loop|macro|match|mod|move|mut|offsetof|override|priv|pub|pure|ref|return|sizeof|static|self|struct|super|true|trait|type|typeof|unsafe|unsized|use|virtual|where|while|yield)\\b"
       # macros
     - special: "[a-z_]+!"
       # Constants
-    - constant: "[A-Z][A-Z_]+"
+    - constant: "\\b[A-Z][A-Z_0-9]+\\b"
       # Numbers
     - constant.number: "\\b[0-9]+\\b"
+      # Booleans
+    - constant: "\\b(true|false)\\b"
       # Traits/Enums/Structs/Types/etc.
-    - type: "[A-Z][a-z]+"
+    - type: "\\b[A-Z]+[a-zA-Z_0-9]*[a-z]+[a-zA-Z_0-9]*\\b"
+      # Builtin types that start with lowercase.
+    - type: "\\b(bool|str|isize|usize|((i|u)(8|16|32|64))|f32|f64)\\b"
 
     - constant.string:
         start: "\""

runtime/syntax/sh.yaml

@@ -1,8 +1,8 @@
 filetype: shell
 
 detect:
-    filename: "(\\.sh$|\\.bash|\\.ash|\\.bashrc|bashrc|\\.bash_aliases|bash_aliases|\\.bash_functions|bash_functions|\\.bash_profile|bash_profile|\\.profile|profile|Pkgfile|pkgmk.conf|profile|rc.conf|PKGBUILD|.ebuild\\$|APKBUILD)"
-    header: "^#!.*/(env +)?(ba)?(a)?sh( |$)"
+    filename: "(\\.sh$|\\.bash|\\.ash|bashrc|bash_aliases|bash_functions|profile|bash-fc\\.|Pkgfile|pkgmk.conf|rc.conf|PKGBUILD|.ebuild\\$|APKBUILD)"
+    header: "^#!.*/(env +)?(ba)?(a)?(mk)?sh( |$)"
 
 rules:
     # Numbers

runtime/syntax/toml.yaml

@@ -4,39 +4,53 @@ detect:
     filename: "\\.toml"
 
 rules:
-    - statement: "(.*)[[:space:]]="
-    - special: "="
-
-      # Bracket thingies
-    - special: "(\\[|\\])"
-
-      # Numbers and strings
-    - constant.number: "\\b([0-9]+|0x[0-9a-fA-F]*)\\b|'.'"
-    - constant.number: "\\\\([0-7]{3}|x[A-Fa-f0-9]{2}|u[A-Fa-f0-9]{4}|U[A-Fa-f0-9]{8})"
-
+    # Punctuation
+    - symbol: '[=,\.]'
+    - symbol.brackets: '[{\[\]}]'
+    # Strings
     - constant.string:
-        start: "\""
-        end: "\""
-        skip: "\\\\."
+        start: '"""'
+        end: '\"{3,5}'
+        skip: '\\.'
         rules:
-            - constant.specialChar: "\\\\."
-
+            - constant.specialChar: '\\u[[:xdigit:]]{4}'
+            - constant.specialChar: '\\U[[:xdigit:]]{8}'
+            - constant.specialChar: '\\[btnfr"\\]'
+    - constant.string:
+        start: '"'
+        end: '"'
+        skip: '\\.'
+        rules:
+            - constant.specialChar: '\\u[[:xdigit:]]{4}'
+            - constant.specialChar: '\\U[[:xdigit:]]{8}'
+            - constant.specialChar: '\\[btnfr"\\]'
+    - constant.string:
+        start: "'''"
+        end: "'{3,5}"
+        rules: []
     - constant.string:
         start: "'"
         end: "'"
-        skip: "\\\\."
-        rules:
-            - constant.specialChar: "\\\\."
-
-    - constant.string:
-        start: "`"
-        end: "`"
-        rules:
-            - constant.specialChar: "\\\\."
-
+        rules: []
+    # Integer
+    - constant.number: '[+-]?(\d+_)*\d+\b'
+    - constant.number: '(0x([[:xdigit:]]+_)*[[:xdigit:]]+|0o([0-7]_)*[0-7]+|0b([01]+_)*[01]+)'
+    # Float
+    - constant.number: '[+-]?(\d+_)*\d+\.(\d+_)*\d+'
+    - constant.number: '[+-]?(\d+_)*\d+(\.(\d+_)*\d+)?[Ee][+-]?(\d+_)*\d+'
+    - constant.number: '(\+|-)(inf|nan)'
+    # Bare key, keys starting with a digit or dash are ambiguous with numbers and are skipped
+    - identifier: '\b[A-Za-z_][A-Za-z0-9_-]*\b'
+    # Boolean and inf, nan without sign
+    - constant.bool.true: '\btrue\b'
+    - constant.bool.false: '\bfalse\b'
+    - constant.number: '\b(inf|nan)\b'
+    # Date and Time
+    - constant: '\d+-\d{2}-\d{2}([T ]\d{2}:\d{2}:\d{2}(\.\d+)?([+-]\d{2}:\d{2}|Z)?)?'
+    - constant: '\d{2}:\d{2}:\d{2}(\.\d+)?'
+    # Comments
     - comment:
         start: "#"
         end: "$"
         rules:
             - todo: "(TODO|XXX|FIXME):?"
-

runtime/syntax/zig.yaml

@@ -4,34 +4,50 @@ detect:
     filename: "\\.zig$"
 
 rules:
-    # function definition
-    - identifier: "fn [a-z0-9_]+"
       # Reserved words
-    - statement: "\\b(align|and|allowzero|anyerror|asm|async|await|break|cancel|catch|comptime|const|continue|defer|else|enum|errdefer|error|export|extern|false|fn|for|if|inline|nakedcc|noalias|null|or|orelse|packed|promise|pub|resume|return|linksection|stdcallcc|struct|suspend|switch|test|threadlocal|true|try|undefined|union|unreachable|use|var|volatile|while)\\b"
+    - statement: "\\b(align|allowzero|and|asm|async|await|break|callconv|catch|comptime|const|continue|defer|else|errdefer|error|export|extern|fn|for|if|inline|noalias|noinline|nosuspend|or|orelse|packed|pub|resume|return|linksection|suspend|switch|test|threadlocal|try|unreachable|usingnamespace|var|volatile|while)\\b"
       # builtin functions
-    - special: "@+[a-z_]+"
-      # Constants
-    - constant: "[A-Z][A-Z_]+([0-9]+)?"
-      # Numbers (hexadecimal + decimal)
-    - constant.number: "\\b(0x[A-F0-9]+|[0-9]+)\\b"
-      # Primitive Types / Derived Data Types
-    - type: "\\b([A-Z][a-z]+|(i8|u8|i16|u16|i32|u32|i64|u64|i128|u128|isize|usize|c_short|c_ushort|c_int|c_uint|c_long|c_ulong|c_longlong|c_ulonglong|c_longdouble|c_void|f16|f32|f64|f128|bool|void|noreturn|type|anyerror|comptime_int|comptime_float))\\b"
+    - special: "@[a-zA-Z_]+"
+      # Primitive Types
+    - type: "\\b(anyframe|anytype|anyerror|bool|comptime_int|comptime_float|enum|f(16|32|64|128)|isize|noreturn|struct|type|union|usize|void)\\b"
+    - type: "\\b(c_u?(short|int|long(long)?)|c_longdouble|c_void)\\b"
+    - type: "\\b((i|u)[0-9]+)\\b"
+
+     # Operators
+    - symbol.operator: "[-!|=;%.+^*:&?<>~]"
+
+     # Parenthesis
+    - symbol.brackets: "[(){}]|\\[|\\]"
+
+     # Constants
+    - constant: "\\b(null|undefined)\\b"
+    - constant.number: "\\b(0b[01_]+|0o[0-7_]+|[0-9_]+|0x[a-fA-F0-9_]+)\\b"
+    - constant.bool: "\\b(true|false)\\b"
 
     - constant.string:
         start: "\""
         end: "\""
         skip: "\\\\."
         rules:
-            - constant.specialChar: "\\\\."
+            - constant.specialChar: "\\\\([nrt\\\\'\"]|x[a-fA-F0-9]{2}|u{[a-fA-F0-9]+})"
 
+    - constant.string:
+        start: "'"
+        end: "'"
+        skip: "\\\\."
+        rules:
+            - error: "..+"
+            - constant.specialChar: "\\\\([nrt\\\\'\"]|x[a-fA-F0-9]{2}|u{[a-fA-F0-9]+})"
+
+    - constant.string:
+        start: "\\\\\\\\"
+        end: "$"
+        skip: "\\\\."
+        rules:
+            - constant.specialChar: "\\\\([nrt\\\\'\"]|x[a-fA-F0-9]{2}|u{[a-fA-F0-9]+})"
+    
     - comment:
         start: "//"
         end: "$"
         rules:
             - todo: "(TODO|XXX|FIXME):?"
-
-    - comment:
-        start: "/\\*"
-        end: "\\*/"
-        rules:
-            - todo: "(TODO|XXX|FIXME):?"

tools/build-date.go

@@ -2,9 +2,23 @@ package main
 
 import (
 	"fmt"
+	"os"
+	"strconv"
 	"time"
 )
 
 func main() {
-	fmt.Println(time.Now().Local().Format("January 02, 2006"))
+	var buildTime time.Time
+	epoch := os.Getenv("SOURCE_DATE_EPOCH")
+	if epoch != "" {
+		i, err := strconv.Atoi(epoch)
+		if err != nil {
+			fmt.Errorf("SOURCE_DATE_EPOCH is not a valid integer")
+			os.Exit(1)
+		}
+		buildTime = time.Unix(int64(i), 0)
+	} else {
+		buildTime = time.Now().Local()
+	}
+	fmt.Println(buildTime.Format("January 02, 2006"))
 }

tools/cross-compile.sh

@@ -6,6 +6,9 @@ mkdir -p micro-$1
 cp LICENSE micro-$1
 cp README.md micro-$1
 cp LICENSE-THIRD-PARTY micro-$1
+cp assets/packaging/micro.1 micro-$1
+cp assets/packaging/micro.desktop micro-$1
+cp assets/micro-logo-mark.svg micro-$1/micro.svg
 
 HASH="$(git rev-parse --short HEAD)"
 VERSION="$(go run tools/build-version.go)"
@@ -22,6 +25,9 @@ mv micro-$1-osx.tar.gz binaries
 # Linux
 echo "Linux 64"
 GOOS=linux GOARCH=amd64 make build
+./tools/package-deb.sh $1
+mv micro-$1-amd64.deb binaries
+
 mv micro micro-$1
 tar -czf micro-$1-linux64.tar.gz micro-$1
 mv micro-$1-linux64.tar.gz binaries

tools/nightly-release.sh

@@ -1,161 +1,33 @@
-# This script creates the nightly release on Github for micro
-# You must have the correct Github access token to run this script
+# This script updates the nightly release on Github for micro
+# Must be run from inside the micro git repository
 
-commitID=$(git rev-parse HEAD)
-info=$(github-release info -u zyedidia -r micro -t nightly)
+commitID=$(git rev-parse --short HEAD)
 
-if [[ $info = *$commitID* ]]; then
-    echo "No new commits since last nightly"
-    exit 1
-fi
-
-echo "Deleting old release"
-github-release delete \
-    --user zyedidia \
-    --repo micro \
-    --tag nightly
-
-echo "Moving tag"
-git tag --force nightly $commitID
-git push --force --tags
-
-echo "Creating new release"
-github-release release \
-    --user zyedidia \
-    --repo micro \
-    --tag nightly \
-    --name "Nightly build" \
-    --description "Autogenerated nightly build of micro. If you don't see anything here that probably means it's building right now!" \
-    --pre-release
+go run remove-nightly-assets.go
 
 echo "Cross compiling binaries"
 ./cross-compile.sh $1
 mv ../binaries .
 
-echo "Uploading OSX binary"
-github-release upload \
-    --user zyedidia \
-    --repo micro \
-    --tag nightly \
-    --name "micro-$1-osx.tar.gz" \
-    --file binaries/micro-$1-osx.tar.gz
+MESSAGE=$'Nightly build\n\nAutogenerated nightly build of micro'
 
-echo "Uploading Linux 64 binary"
-github-release upload \
-    --user zyedidia \
-    --repo micro \
-    --tag nightly \
-    --name "micro-$1-linux64.tar.gz" \
-    --file binaries/micro-$1-linux64.tar.gz
-
-echo "Uploading Linux 64 static binary"
-github-release upload \
-    --user zyedidia \
-    --repo micro \
-    --tag nightly \
-    --name "micro-$1-linux64-static.tar.gz" \
-    --file binaries/micro-$1-linux64-static.tar.gz
-
-echo "Uploading Linux 32 binary"
-github-release upload \
-    --user zyedidia \
-    --repo micro \
-    --tag nightly \
-    --name "micro-$1-linux32.tar.gz" \
-    --file binaries/micro-$1-linux32.tar.gz
-
-echo "Uploading Linux Arm 32 binary"
-github-release upload \
-    --user zyedidia \
-    --repo micro \
-    --tag nightly \
-    --name "micro-$1-linux-arm.tar.gz" \
-    --file binaries/micro-$1-linux-arm.tar.gz
-
-echo "Uploading Linux Arm 64 binary"
-github-release upload \
-    --user zyedidia \
-    --repo micro \
-    --tag nightly \
-    --name "micro-$1-linux-arm64.tar.gz" \
-    --file binaries/micro-$1-linux-arm64.tar.gz
-
-echo "Uploading FreeBSD 64 binary"
-github-release upload \
-    --user zyedidia \
-    --repo micro \
-    --tag nightly \
-    --name "micro-$1-freebsd64.tar.gz" \
-    --file binaries/micro-$1-freebsd64.tar.gz
-
-echo "Uploading FreeBSD 32 binary"
-github-release upload \
-    --user zyedidia \
-    --repo micro \
-    --tag nightly \
-    --name "micro-$1-freebsd32.tar.gz" \
-    --file binaries/micro-$1-freebsd32.tar.gz
-
-echo "Uploading OpenBSD 64 binary"
-github-release upload \
-    --user zyedidia \
-    --repo micro \
-    --tag nightly \
-    --name "micro-$1-openbsd64.tar.gz" \
-    --file binaries/micro-$1-openbsd64.tar.gz
-
-echo "Uploading OpenBSD 32 binary"
-github-release upload \
-    --user zyedidia \
-    --repo micro \
-    --tag nightly \
-    --name "micro-$1-openbsd32.tar.gz" \
-    --file binaries/micro-$1-openbsd32.tar.gz
-
-echo "Uploading NetBSD 64 binary"
-github-release upload \
-    --user zyedidia \
-    --repo micro \
-    --tag nightly \
-    --name "micro-$1-netbsd64.tar.gz" \
-    --file binaries/micro-$1-netbsd64.tar.gz
-
-echo "Uploading NetBSD 32 binary"
-github-release upload \
-    --user zyedidia \
-    --repo micro \
-    --tag nightly \
-    --name "micro-$1-netbsd32.tar.gz" \
-    --file binaries/micro-$1-netbsd32.tar.gz
-
-echo "Uploading Windows 64 binary"
-github-release upload \
-    --user zyedidia \
-    --repo micro \
-    --tag nightly \
-    --name "micro-$1-win64.zip" \
-    --file binaries/micro-$1-win64.zip
-
-echo "Uploading Windows 32 binary"
-github-release upload \
-    --user zyedidia \
-    --repo micro \
-    --tag nightly \
-    --name "micro-$1-win32.zip" \
-    --file binaries/micro-$1-win32.zip
-
-# echo "Uploading vendored tarball"
-# github-release upload \
-#     --user zyedidia \
-#     --repo micro \
-#     --tag nightly \
-#     --name "micro-$1-src.tar.gz" \
-#     --file binaries/micro-$1-src.tar.gz
-#
-# echo "Uploading vendored zip"
-# github-release upload \
-#     --user zyedidia \
-#     --repo micro \
-#     --tag nightly \
-#     --name "micro-$1-src.zip" \
-#     --file binaries/micro-$1-src.zip
+echo "Updating release"
+hub release edit nightly \
+    --prerelease \
+    --draft=false \
+    --message "$MESSAGE (please DISREGARD the creation date of this Github release). Assets uploaded on $(date) for commit $commitID." \
+    --attach "binaries/micro-$1-osx.tar.gz" \
+    --attach "binaries/micro-$1-linux64.tar.gz" \
+    --attach "binaries/micro-$1-linux64-static.tar.gz" \
+    --attach "binaries/micro-$1-amd64.deb" \
+    --attach "binaries/micro-$1-linux32.tar.gz" \
+    --attach "binaries/micro-$1-linux-arm.tar.gz" \
+    --attach "binaries/micro-$1-linux-arm64.tar.gz" \
+    --attach "binaries/micro-$1-freebsd64.tar.gz" \
+    --attach "binaries/micro-$1-freebsd32.tar.gz" \
+    --attach "binaries/micro-$1-openbsd64.tar.gz" \
+    --attach "binaries/micro-$1-openbsd32.tar.gz" \
+    --attach "binaries/micro-$1-netbsd64.tar.gz" \
+    --attach "binaries/micro-$1-netbsd32.tar.gz" \
+    --attach "binaries/micro-$1-win64.zip" \
+    --attach "binaries/micro-$1-win32.zip"

tools/package-deb.sh

@@ -0,0 +1 @@
+fpm -s dir -t deb -p micro-$1-amd64.deb --name micro --license mit --version $1 --deb-recommends xclip --description "A modern and intuitive terminal-based text editor" ./micro=/usr/bin/micro ./assets/packaging/micro.1=/usr/share/man/man1/micro.1

tools/pre-release.sh

@@ -8,145 +8,30 @@ tag="v$1"
 
 echo "Creating tag"
 git tag $tag $commitID
-git push --tags
-
-echo "Creating new release"
-github-release release \
-    --user zyedidia \
-    --repo micro \
-    --tag $tag \
-    --name "$1" \
-    --description "$2" \
-    --pre-release
+hub push --tags
 
 echo "Cross compiling binaries"
 ./cross-compile.sh $1
 mv ../binaries .
 
-echo "Uploading OSX binary"
-github-release upload \
-    --user zyedidia \
-    --repo micro \
-    --tag $tag \
-    --name "micro-$1-osx.tar.gz" \
-    --file binaries/micro-$1-osx.tar.gz
+NL=$'\n'
 
-echo "Uploading Linux 64 binary"
-github-release upload \
-    --user zyedidia \
-    --repo micro \
-    --tag $tag \
-    --name "micro-$1-linux64.tar.gz" \
-    --file binaries/micro-$1-linux64.tar.gz
-
-echo "Uploading Linux 64 static binary"
-github-release upload \
-    --user zyedidia \
-    --repo micro \
-    --tag $tag \
-    --name "micro-$1-linux64-static.tar.gz" \
-    --file binaries/micro-$1-linux64-static.tar.gz
-
-echo "Uploading Linux 32 binary"
-github-release upload \
-    --user zyedidia \
-    --repo micro \
-    --tag $tag \
-    --name "micro-$1-linux32.tar.gz" \
-    --file binaries/micro-$1-linux32.tar.gz
-
-echo "Uploading Linux Arm 32 binary"
-github-release upload \
-    --user zyedidia \
-    --repo micro \
-    --tag $tag \
-    --name "micro-$1-linux-arm.tar.gz" \
-    --file binaries/micro-$1-linux-arm.tar.gz
-
-echo "Uploading Linux Arm 64 binary"
-github-release upload \
-    --user zyedidia \
-    --repo micro \
-    --tag $tag \
-    --name "micro-$1-linux-arm64.tar.gz" \
-    --file binaries/micro-$1-linux-arm64.tar.gz
-
-echo "Uploading FreeBSD 64 binary"
-github-release upload \
-    --user zyedidia \
-    --repo micro \
-    --tag $tag \
-    --name "micro-$1-freebsd64.tar.gz" \
-    --file binaries/micro-$1-freebsd64.tar.gz
-
-echo "Uploading FreeBSD 32 binary"
-github-release upload \
-    --user zyedidia \
-    --repo micro \
-    --tag $tag \
-    --name "micro-$1-freebsd32.tar.gz" \
-    --file binaries/micro-$1-freebsd32.tar.gz
-
-echo "Uploading OpenBSD 64 binary"
-github-release upload \
-    --user zyedidia \
-    --repo micro \
-    --tag $tag \
-    --name "micro-$1-openbsd64.tar.gz" \
-    --file binaries/micro-$1-openbsd64.tar.gz
-
-echo "Uploading OpenBSD 32 binary"
-github-release upload \
-    --user zyedidia \
-    --repo micro \
-    --tag $tag \
-    --name "micro-$1-openbsd32.tar.gz" \
-    --file binaries/micro-$1-openbsd32.tar.gz
-
-echo "Uploading NetBSD 64 binary"
-github-release upload \
-    --user zyedidia \
-    --repo micro \
-    --tag $tag \
-    --name "micro-$1-netbsd64.tar.gz" \
-    --file binaries/micro-$1-netbsd64.tar.gz
-
-echo "Uploading NetBSD 32 binary"
-github-release upload \
-    --user zyedidia \
-    --repo micro \
-    --tag $tag \
-    --name "micro-$1-netbsd32.tar.gz" \
-    --file binaries/micro-$1-netbsd32.tar.gz
-
-echo "Uploading Windows 64 binary"
-github-release upload \
-    --user zyedidia \
-    --repo micro \
-    --tag $tag \
-    --name "micro-$1-win64.zip" \
-    --file binaries/micro-$1-win64.zip
-
-echo "Uploading Windows 32 binary"
-github-release upload \
-    --user zyedidia \
-    --repo micro \
-    --tag $tag \
-    --name "micro-$1-win32.zip" \
-    --file binaries/micro-$1-win32.zip
-
-# echo "Uploading vendored tarball"
-# github-release upload \
-#     --user zyedidia \
-#     --repo micro \
-#     --tag $tag \
-#     --name "micro-$1-src.tar.gz" \
-#     --file binaries/micro-$1-src.tar.gz
-#
-# echo "Uploading vendored zip"
-# github-release upload \
-#     --user zyedidia \
-#     --repo micro \
-#     --tag $tag \
-#     --name "micro-$1-src.zip" \
-#     --file binaries/micro-$1-src.zip
+echo "Creating new release"
+hub release create $tag \
+    --prerelease \
+    --message "$1${NL}${NL}$2" \
+    --attach "binaries/micro-$1-osx.tar.gz" \
+    --attach "binaries/micro-$1-linux64.tar.gz" \
+    --attach "binaries/micro-$1-linux64-static.tar.gz" \
+    --attach "binaries/micro-$1-amd64.deb" \
+    --attach "binaries/micro-$1-linux32.tar.gz" \
+    --attach "binaries/micro-$1-linux-arm.tar.gz" \
+    --attach "binaries/micro-$1-linux-arm64.tar.gz" \
+    --attach "binaries/micro-$1-freebsd64.tar.gz" \
+    --attach "binaries/micro-$1-freebsd32.tar.gz" \
+    --attach "binaries/micro-$1-openbsd64.tar.gz" \
+    --attach "binaries/micro-$1-openbsd32.tar.gz" \
+    --attach "binaries/micro-$1-netbsd64.tar.gz" \
+    --attach "binaries/micro-$1-netbsd32.tar.gz" \
+    --attach "binaries/micro-$1-win64.zip" \
+    --attach "binaries/micro-$1-win32.zip"