diff --git a/Makefile b/Makefile index 8862e058ee..083ea1e922 100644 --- a/Makefile +++ b/Makefile @@ -6,8 +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) 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 +GOVARS = -X github.com/micro-editor/micro/v2/internal/util.Version=$(VERSION) -X github.com/micro-editor/micro/v2/internal/util.CommitHash=$(HASH) -X 'github.com/micro-editor/micro/v2/internal/util.CompileDate=$(DATE)' +DEBUGVAR = -X github.com/micro-editor/micro/v2/internal/util.Debug=ON VSCODE_TESTS_BASE_URL = 'https://raw.githubusercontent.com/microsoft/vscode/e6a45f4242ebddb7aa9a229f85555e8a3bd987e2/src/vs/editor/test/common/model/' CGO_ENABLED := $(if $(CGO_ENABLED),$(CGO_ENABLED),0) diff --git a/README.md b/README.md index 80905e766a..85b7909e6b 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ micro logo -![Test Workflow](https://github.com/zyedidia/micro/actions/workflows/test.yaml/badge.svg) -[![Go Report Card](https://goreportcard.com/badge/github.com/zyedidia/micro/v2)](https://goreportcard.com/report/github.com/zyedidia/micro/v2) -[![Release](https://img.shields.io/github/release/zyedidia/micro.svg?label=Release)](https://github.com/zyedidia/micro/releases) -[![MIT License](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/zyedidia/micro/blob/master/LICENSE) +![Test Workflow](https://github.com/micro-editor/micro/actions/workflows/test.yaml/badge.svg) +[![Go Report Card](https://goreportcard.com/badge/github.com/micro-editor/micro/v2)](https://goreportcard.com/report/github.com/micro-editor/micro/v2) +[![Release](https://img.shields.io/github/release/micro-editor/micro.svg?label=Release)](https://github.com/micro-editor/micro/releases) +[![MIT License](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/micro-editor/micro/blob/master/LICENSE) [![Join the chat at https://gitter.im/zyedidia/micro](https://badges.gitter.im/zyedidia/micro.svg)](https://gitter.im/zyedidia/micro?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Snap Status](https://snapcraft.io/micro/badge.svg)](https://snapcraft.io/micro) @@ -57,18 +57,18 @@ You can also check out the website for Micro at https://micro-editor.github.io. ## Installation -To install micro, you can download a [prebuilt binary](https://github.com/zyedidia/micro/releases), or you can build it from source. +To install micro, you can download a [prebuilt binary](https://github.com/micro-editor/micro/releases), or you can build it from source. -If you want more information about ways to install micro, see this [wiki page](https://github.com/zyedidia/micro/wiki/Installing-Micro). +If you want more information about ways to install micro, see this [wiki page](https://github.com/micro-editor/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. +A desktop entry file and man page can be found in the [assets/packaging](https://github.com/micro-editor/micro/tree/master/assets/packaging) directory. ### Pre-built binaries -Pre-built binaries are distributed in [releases](https://github.com/zyedidia/micro/releases). +Pre-built binaries are distributed in [releases](https://github.com/micro-editor/micro/releases). To uninstall micro, simply remove the binary, and the configuration directory at `~/.config/micro`. @@ -85,14 +85,14 @@ The script will place the micro binary in the current directory. From there, you With [Eget](https://github.com/zyedidia/eget) installed, you can easily get a pre-built binary: ``` -eget zyedidia/micro +eget micro-editor/micro ``` Use `--tag VERSION` to download a specific tagged version. ``` -eget --tag nightly zyedidia/micro # download the nightly version (compiled every day at midnight UTC) -eget --tag v2.0.8 zyedidia/micro # download version 2.0.8 rather than the latest release +eget --tag nightly micro-editor/micro # download the nightly version (compiled every day at midnight UTC) +eget --tag v2.0.8 micro-editor/micro # download version 2.0.8 rather than the latest release ``` You can install `micro` by adding `--to /usr/local/bin` to the `eget` command, or move the binary manually to a directory on your `$PATH` after the download completes. @@ -109,7 +109,7 @@ brew install micro **Note for Mac:** All micro keybindings use the control or alt (option) key, not the command key. By default, macOS terminals do not forward alt key events. To fix this, please see -the section on [macOS terminals](https://github.com/zyedidia/micro#macos-terminal) further below. +the section on [macOS terminals](https://github.com/micro-editor/micro#macos-terminal) further below. On Linux, you can install micro through [snap](https://snapcraft.io/docs/core/install) @@ -132,7 +132,7 @@ for other operating systems. These packages are not guaranteed to be up-to-date. * `eopkg install micro` (Solus). * `pacstall -I micro` (Pacstall). * `apt-get install micro` (ALT Linux) - * See [wiki](https://github.com/zyedidia/micro/wiki/Installing-Micro) for details about CRUX, Termux. + * See [wiki](https://github.com/micro-editor/micro/wiki/Installing-Micro) for details about CRUX, Termux. * distro-agnostic package managers: * `nix profile install nixpkgs#micro` (with [Nix](https://nixos.org/) and flakes enabled) * `flox install micro` (with [Flox](https://flox.dev)) @@ -165,7 +165,7 @@ If your operating system does not have a binary release, but does run Go, you ca Make sure that you have Go version 1.19 or greater and Go modules are enabled. ``` -git clone https://github.com/zyedidia/micro +git clone https://github.com/micro-editor/micro cd micro make build sudo mv micro /usr/local/bin # optional @@ -176,7 +176,7 @@ anywhere you like (for example `/usr/local/bin`). The command `make install` will install the binary to `$GOPATH/bin` or `$GOBIN`. -You can install directly with `go get` (`go get github.com/zyedidia/micro/cmd/micro`) but this isn't +You can install directly with `go get` (`go get github.com/micro-editor/micro/cmd/micro`) but this isn't recommended because it doesn't build micro with version information (necessary for the plugin manager), and doesn't disable debug mode. @@ -261,14 +261,14 @@ click to enable line selection. micro has a built-in help system which you can access by pressing Ctrl-e and typing `help`. Additionally, you can view the help files here: -- [main help](https://github.com/zyedidia/micro/tree/master/runtime/help/help.md) -- [keybindings](https://github.com/zyedidia/micro/tree/master/runtime/help/keybindings.md) -- [commands](https://github.com/zyedidia/micro/tree/master/runtime/help/commands.md) -- [colors](https://github.com/zyedidia/micro/tree/master/runtime/help/colors.md) -- [options](https://github.com/zyedidia/micro/tree/master/runtime/help/options.md) -- [plugins](https://github.com/zyedidia/micro/tree/master/runtime/help/plugins.md) +- [main help](https://github.com/micro-editor/micro/tree/master/runtime/help/help.md) +- [keybindings](https://github.com/micro-editor/micro/tree/master/runtime/help/keybindings.md) +- [commands](https://github.com/micro-editor/micro/tree/master/runtime/help/commands.md) +- [colors](https://github.com/micro-editor/micro/tree/master/runtime/help/colors.md) +- [options](https://github.com/micro-editor/micro/tree/master/runtime/help/options.md) +- [plugins](https://github.com/micro-editor/micro/tree/master/runtime/help/plugins.md) -I also recommend reading the [tutorial](https://github.com/zyedidia/micro/tree/master/runtime/help/tutorial.md) for +I also recommend reading the [tutorial](https://github.com/micro-editor/micro/tree/master/runtime/help/tutorial.md) for a brief introduction to the more powerful configuration features micro offers. There is also an unofficial Discord, which you can join at https://discord.gg/nhWR6armnR. @@ -277,9 +277,9 @@ There is also an unofficial Discord, which you can join at https://discord.gg/nh If you find any bugs, please report them! I am also happy to accept pull requests from anyone. -You can use the [GitHub issue tracker](https://github.com/zyedidia/micro/issues) +You can use the [GitHub issue tracker](https://github.com/micro-editor/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) or the [Discord](https://discord.gg/nhWR6armnR). You can also use the [Discussions](https://github.com/zyedidia/micro/discussions) section on Github for a forum-like setting or for Q&A. +For a more informal setting to discuss the editor, you can join the [Gitter chat](https://gitter.im/zyedidia/micro) or the [Discord](https://discord.gg/nhWR6armnR). You can also use the [Discussions](https://github.com/micro-editor/micro/discussions) section on Github for a forum-like setting or for Q&A. Sometimes I am unresponsive, and I apologize! If that happens, please ping me. diff --git a/assets/packaging/micro.1 b/assets/packaging/micro.1 index 909bbde606..61db841a08 100644 --- a/assets/packaging/micro.1 +++ b/assets/packaging/micro.1 @@ -132,9 +132,9 @@ which can be accessed from within micro. Micro tells you what key combination to press to get help in the lower right. .SH BUGS A comprehensive list of bugs will not be listed in this manpage. See the Github -page at \fBhttps://github.com/zyedidia/micro/issues\fP for a list of known bugs +page at \fBhttps://github.com/micro-editor/micro/issues\fP for a list of known bugs 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. MIT license. -See \fBhttps://github.com/zyedidia/micro\fP for details. +See \fBhttps://github.com/micro-editor/micro\fP for details. diff --git a/cmd/micro/clean.go b/cmd/micro/clean.go index 26726ba9bf..1d14d8d86b 100644 --- a/cmd/micro/clean.go +++ b/cmd/micro/clean.go @@ -10,9 +10,9 @@ import ( "sort" "strings" - "github.com/zyedidia/micro/v2/internal/buffer" - "github.com/zyedidia/micro/v2/internal/config" - "github.com/zyedidia/micro/v2/internal/util" + "github.com/micro-editor/micro/v2/internal/buffer" + "github.com/micro-editor/micro/v2/internal/config" + "github.com/micro-editor/micro/v2/internal/util" ) func shouldContinue() bool { diff --git a/cmd/micro/debug.go b/cmd/micro/debug.go index 1504a03df0..973ae5ca90 100644 --- a/cmd/micro/debug.go +++ b/cmd/micro/debug.go @@ -4,7 +4,7 @@ import ( "log" "os" - "github.com/zyedidia/micro/v2/internal/util" + "github.com/micro-editor/micro/v2/internal/util" ) // NullWriter simply sends writes into the void diff --git a/cmd/micro/initlua.go b/cmd/micro/initlua.go index ffe175a02d..2f7b2c625b 100644 --- a/cmd/micro/initlua.go +++ b/cmd/micro/initlua.go @@ -7,14 +7,14 @@ import ( lua "github.com/yuin/gopher-lua" luar "layeh.com/gopher-luar" - "github.com/zyedidia/micro/v2/internal/action" - "github.com/zyedidia/micro/v2/internal/buffer" - "github.com/zyedidia/micro/v2/internal/config" - "github.com/zyedidia/micro/v2/internal/display" - ulua "github.com/zyedidia/micro/v2/internal/lua" - "github.com/zyedidia/micro/v2/internal/screen" - "github.com/zyedidia/micro/v2/internal/shell" - "github.com/zyedidia/micro/v2/internal/util" + "github.com/micro-editor/micro/v2/internal/action" + "github.com/micro-editor/micro/v2/internal/buffer" + "github.com/micro-editor/micro/v2/internal/config" + "github.com/micro-editor/micro/v2/internal/display" + ulua "github.com/micro-editor/micro/v2/internal/lua" + "github.com/micro-editor/micro/v2/internal/screen" + "github.com/micro-editor/micro/v2/internal/shell" + "github.com/micro-editor/micro/v2/internal/util" ) func init() { diff --git a/cmd/micro/micro.go b/cmd/micro/micro.go index bf4d088fcd..bafb1795a4 100644 --- a/cmd/micro/micro.go +++ b/cmd/micro/micro.go @@ -18,15 +18,15 @@ import ( "github.com/go-errors/errors" isatty "github.com/mattn/go-isatty" + "github.com/micro-editor/micro/v2/internal/action" + "github.com/micro-editor/micro/v2/internal/buffer" + "github.com/micro-editor/micro/v2/internal/clipboard" + "github.com/micro-editor/micro/v2/internal/config" + "github.com/micro-editor/micro/v2/internal/screen" + "github.com/micro-editor/micro/v2/internal/shell" + "github.com/micro-editor/micro/v2/internal/util" "github.com/micro-editor/tcell/v2" 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" - "github.com/zyedidia/micro/v2/internal/screen" - "github.com/zyedidia/micro/v2/internal/shell" - "github.com/zyedidia/micro/v2/internal/util" ) var ( @@ -374,7 +374,7 @@ func main() { 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") + fmt.Println("Micro encountered an error:", errors.Wrap(err, 2).ErrorStack(), "\nIf you can reproduce this error, please report it at https://github.com/micro-editor/micro/issues") } // immediately backup all buffers with unsaved changes for _, b := range buffer.OpenBuffers { diff --git a/cmd/micro/micro_test.go b/cmd/micro/micro_test.go index 7235bac19d..09cad432cb 100644 --- a/cmd/micro/micro_test.go +++ b/cmd/micro/micro_test.go @@ -7,12 +7,12 @@ import ( "testing" "github.com/go-errors/errors" + "github.com/micro-editor/micro/v2/internal/action" + "github.com/micro-editor/micro/v2/internal/buffer" + "github.com/micro-editor/micro/v2/internal/config" + "github.com/micro-editor/micro/v2/internal/screen" "github.com/micro-editor/tcell/v2" "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" ) var tempDir string diff --git a/data/io.github.zyedidia.micro.metainfo.xml b/data/io.github.zyedidia.micro.metainfo.xml index bdd608b3f8..2abda6b9f4 100644 --- a/data/io.github.zyedidia.micro.metainfo.xml +++ b/data/io.github.zyedidia.micro.metainfo.xml @@ -39,15 +39,15 @@ Micro Text Editor editing its source code - https://raw.githubusercontent.com/zyedidia/micro/master/assets/micro-solarized.png + https://raw.githubusercontent.com/micro-editor/micro/master/assets/micro-solarized.png https://micro-editor.github.io - https://github.com/zyedidia/micro/issues + https://github.com/micro-editor/micro/issues https://micro-editor.github.io/about.html https://micro-editor.github.io/about.html https://github.com/zyedidia - https://github.com/zyedidia/micro - https://github.com/zyedidia/micro#contributing + https://github.com/micro-editor/micro + https://github.com/micro-editor/micro#contributing diff --git a/data/micro.json b/data/micro.json index 8a31adda0f..2d856ebb7f 100644 --- a/data/micro.json +++ b/data/micro.json @@ -1,43 +1,43 @@ { - "$comment": "https://github.com/zyedidia/micro", + "$comment": "https://github.com/micro-editor/micro", "$schema": "http://json-schema.org/draft-07/schema#", "title": "options", "description": "A micro editor config schema", "type": "object", "properties": { "autoindent": { - "description": "Whether to use the same indentation as a previous line\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "Whether to use the same indentation as a previous line\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "boolean", "default": true }, "autosave": { - "description": "A delay between automatic saves\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "A delay between automatic saves\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "integer", "minimum": 0, "default": 0 }, "autosu": { - "description": "Whether attempt to use super user privileges\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "Whether attempt to use super user privileges\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "boolean", "default": false }, "backup": { - "description": "Whether to backup all open buffers\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "Whether to backup all open buffers\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "boolean", "default": true }, "backupdir": { - "description": "A directory to store backups\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "A directory to store backups\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "string", "default": "" }, "basename": { - "description": "Whether to show a basename instead of a full path\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "Whether to show a basename instead of a full path\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "boolean", "default": false }, "clipboard": { - "description": "A way to access the system clipboard\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "A way to access the system clipboard\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "string", "enum": [ "external", @@ -47,13 +47,13 @@ "default": "external" }, "colorcolumn": { - "description": "A position to display a column\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "A position to display a column\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "integer", "minimum": 0, "default": 0 }, "colorscheme": { - "description": "A color scheme\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "A color scheme\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "string", "enum": [ "atom-dark", @@ -85,42 +85,42 @@ "default": "default" }, "cursorline": { - "description": "Whether to highlight a line with a cursor with a different color\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "Whether to highlight a line with a cursor with a different color\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "boolean", "default": true }, "diffgutter": { - "description": "Whether to display diff inticators before lines\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "Whether to display diff inticators before lines\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "boolean", "default": false }, "divchars": { - "description": "Divider chars for vertical and horizontal splits\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "Divider chars for vertical and horizontal splits\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "string", "default": "|-" }, "divreverse": { - "description": "Whether to use inversed color scheme colors for splits\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "Whether to use inversed color scheme colors for splits\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "boolean", "default": true }, "encoding": { - "description": "An encoding used to open and save files\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "An encoding used to open and save files\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "string", "default": "utf-8" }, "eofnewline": { - "description": "Whether to add a missing trailing new line\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "Whether to add a missing trailing new line\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "boolean", "default": true }, "fastdirty": { - "description": "Whether to use a fast algorithm to determine whether a file is changed\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "Whether to use a fast algorithm to determine whether a file is changed\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "boolean", "default": false }, "fileformat": { - "description": "A line ending format\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "A line ending format\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "string", "enum": [ "unix", @@ -129,53 +129,53 @@ "default": "unix" }, "filetype": { - "description": "A filetype for the current buffer\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "A filetype for the current buffer\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "string", "default": "unknown" }, "hlsearch": { - "description": "Whether to highlight all instances of a searched text after a successful search\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "Whether to highlight all instances of a searched text after a successful search\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "boolean", "default": false }, "incsearch": { - "description": "Whether to enable an incremental search in `Find` prompt\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "Whether to enable an incremental search in `Find` prompt\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "boolean", "default": true }, "ignorecase": { - "description": "Whether to perform case-insensitive searches\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "Whether to perform case-insensitive searches\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "boolean", "default": true }, "indentchar": { - "description": "An indentation character\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "An indentation character\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "string", "maxLength": 1, "default": " " }, "infobar": { - "description": "Whether to enable a line at the bottom where messages are printed\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "Whether to enable a line at the bottom where messages are printed\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "boolean", "default": true }, "keepautoindent": { - "description": "Whether add a whitespace while using autoindent\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "Whether add a whitespace while using autoindent\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "boolean", "default": false }, "keymenu": { - "description": "Whether to display nano-style key menu at the bottom\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "Whether to display nano-style key menu at the bottom\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "boolean", "default": false }, "matchbrace": { - "description": "Whether to show matching braces\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "Whether to show matching braces\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "boolean", "default": true }, "matchbracestyle": { - "description": "Whether to underline or highlight matching braces\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "Whether to underline or highlight matching braces\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "string", "enum": [ "underline", @@ -184,132 +184,132 @@ "default": "underline" }, "mkparents": { - "description": "Whether to create missing directories\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "Whether to create missing directories\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "boolean", "default": false }, "mouse": { - "description": "Whether to enable mouse support\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "Whether to enable mouse support\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "boolean", "default": true }, "paste": { - "description": "Whether to treat characters sent from the terminal in a single chunk as a paste event\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "Whether to treat characters sent from the terminal in a single chunk as a paste event\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "boolean", "default": false }, "parsecursor": { - "description": "Whether to extract a line number and a column to open files with from file names\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "Whether to extract a line number and a column to open files with from file names\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "boolean", "default": false }, "permbackup": { - "description": "Whether to permanently save backups\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "Whether to permanently save backups\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "boolean", "default": false }, "pluginchannels": { - "description": "A file with list of plugin channels\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "A file with list of plugin channels\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "string", "default": "https://raw.githubusercontent.com/micro-editor/plugin-channel/master/channel.json" }, "pluginrepos": { - "description": "Plugin repositories\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "Plugin repositories\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "array", "uniqueItems": true, "items": { - "description": "A pluging repository\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "A pluging repository\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "string" }, "default": [] }, "readonly": { - "description": "Whether to forbid buffer editing\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "Whether to forbid buffer editing\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "boolean", "default": false }, "rmtrailingws": { - "description": "Whether to remove trailing whitespaces\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "Whether to remove trailing whitespaces\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "boolean", "default": false }, "ruler": { - "description": "Whether to display line numbers\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "Whether to display line numbers\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "boolean", "default": true }, "relativeruler": { - "description": "Whether to display relative line numbers\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "Whether to display relative line numbers\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "boolean", "default": false }, "savecursor": { - "description": "Whether to save cursor position in files\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "Whether to save cursor position in files\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "boolean", "default": false }, "savehistory": { - "description": "Whether to save command history between closing and re-opening editor\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "Whether to save command history between closing and re-opening editor\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "boolean", "default": true }, "saveundo": { - "description": "Whether to save undo after closing file\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "Whether to save undo after closing file\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "boolean", "default": false }, "scrollbar": { - "description": "Whether to save undo after closing file\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "Whether to save undo after closing file\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "boolean", "default": false }, "scrollmargin": { - "description": "A margin at which a view starts scrolling when a cursor approaches an edge of a view\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "A margin at which a view starts scrolling when a cursor approaches an edge of a view\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "integer", "default": 3 }, "scrollspeed": { - "description": "Line count to scroll for one scroll event\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "Line count to scroll for one scroll event\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "integer", "default": 2 }, "smartpaste": { - "description": "Whether to add a leading whitespace while pasting multiple lines\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "Whether to add a leading whitespace while pasting multiple lines\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "boolean", "default": true }, "softwrap": { - "description": "Whether to wrap long lines\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "Whether to wrap long lines\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "boolean", "default": false }, "splitbottom": { - "description": "Whether to create a new horizontal split below the current one\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "Whether to create a new horizontal split below the current one\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "boolean", "default": true }, "splitright": { - "description": "Whether to create a new vertical split right of the current one\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "Whether to create a new vertical split right of the current one\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "boolean", "default": true }, "statusformatl": { - "description": "Format string of left-justified part of the statusline\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "Format string of left-justified part of the statusline\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "string", "default": "$(filename) $(modified)($(line),$(col)) $(status.paste)| ft:$(opt:filetype) | $(opt:fileformat) | $(opt:encoding)" }, "statusformatr": { - "description": "Format string of right-justified part of the statusline\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "Format string of right-justified part of the statusline\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "string", "default": "$(bind:ToggleKeyMenu): bindings, $(bind:ToggleHelp): help" }, "statusline": { - "description": "Whether to display a status line\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "Whether to display a status line\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "boolean", "default": true }, "sucmd": { - "description": "A super user command\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "A super user command\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "string", "default": "sudo", "examples": [ @@ -318,47 +318,47 @@ ] }, "syntax": { - "description": "Whether to enable a syntax highlighting\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "Whether to enable a syntax highlighting\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "boolean", "default": true }, "tabmovement": { - "description": "Whether to navigate spaces at the beginning of lines as if they are tabs\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "Whether to navigate spaces at the beginning of lines as if they are tabs\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "boolean", "default": false }, "tabhighlight": { - "description": "Whether to invert tab character colors\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "Whether to invert tab character colors\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "boolean", "default": false }, "tabreverse": { - "description": "Whether to reverse tab bar colors\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "Whether to reverse tab bar colors\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "boolean", "default": true }, "tabsize": { - "description": "A tab size\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "A tab size\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "integer", "default": 4 }, "tabstospaces": { - "description": "Whether to use spaces instead of tabs\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "Whether to use spaces instead of tabs\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "boolean", "default": false }, "useprimary": { - "description": "Whether to use primary clipboard to copy selections in the background\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "Whether to use primary clipboard to copy selections in the background\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "boolean", "default": true }, "wordwrap": { - "description": "Whether to wrap long lines by words\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "Whether to wrap long lines by words\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "boolean", "default": false }, "xterm": { - "description": "Whether to assume that the current terminal is `xterm`\nhttps://github.com/zyedidia/micro/blob/master/runtime/help/options.md#options", + "description": "Whether to assume that the current terminal is `xterm`\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options", "type": "boolean", "default": false } diff --git a/go.mod b/go.mod index a78166d708..2e243c271d 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/zyedidia/micro/v2 +module github.com/micro-editor/micro/v2 require ( github.com/blang/semver v3.5.1+incompatible diff --git a/internal/action/actions.go b/internal/action/actions.go index bcdc121278..491199f76f 100644 --- a/internal/action/actions.go +++ b/internal/action/actions.go @@ -11,14 +11,14 @@ import ( "time" shellquote "github.com/kballard/go-shellquote" + "github.com/micro-editor/micro/v2/internal/buffer" + "github.com/micro-editor/micro/v2/internal/clipboard" + "github.com/micro-editor/micro/v2/internal/config" + "github.com/micro-editor/micro/v2/internal/display" + "github.com/micro-editor/micro/v2/internal/screen" + "github.com/micro-editor/micro/v2/internal/shell" + "github.com/micro-editor/micro/v2/internal/util" "github.com/micro-editor/tcell/v2" - "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" - "github.com/zyedidia/micro/v2/internal/screen" - "github.com/zyedidia/micro/v2/internal/shell" - "github.com/zyedidia/micro/v2/internal/util" ) // ScrollUp is not an action diff --git a/internal/action/actions_posix.go b/internal/action/actions_posix.go index 59f04ede64..7831f4329a 100644 --- a/internal/action/actions_posix.go +++ b/internal/action/actions_posix.go @@ -5,7 +5,7 @@ package action import ( "syscall" - "github.com/zyedidia/micro/v2/internal/screen" + "github.com/micro-editor/micro/v2/internal/screen" ) // Suspend sends micro to the background. This is the same as pressing CtrlZ in most unix programs. diff --git a/internal/action/bindings.go b/internal/action/bindings.go index 9a5cb86ff0..555a21b803 100644 --- a/internal/action/bindings.go +++ b/internal/action/bindings.go @@ -12,10 +12,10 @@ import ( "unicode" "github.com/micro-editor/json5" + "github.com/micro-editor/micro/v2/internal/config" + "github.com/micro-editor/micro/v2/internal/screen" + "github.com/micro-editor/micro/v2/internal/util" "github.com/micro-editor/tcell/v2" - "github.com/zyedidia/micro/v2/internal/config" - "github.com/zyedidia/micro/v2/internal/screen" - "github.com/zyedidia/micro/v2/internal/util" ) var Binder = map[string]func(e Event, action string){ diff --git a/internal/action/bufpane.go b/internal/action/bufpane.go index 3f0c4b1eec..df6a20f8d8 100644 --- a/internal/action/bufpane.go +++ b/internal/action/bufpane.go @@ -6,14 +6,14 @@ import ( luar "layeh.com/gopher-luar" + "github.com/micro-editor/micro/v2/internal/buffer" + "github.com/micro-editor/micro/v2/internal/config" + "github.com/micro-editor/micro/v2/internal/display" + ulua "github.com/micro-editor/micro/v2/internal/lua" + "github.com/micro-editor/micro/v2/internal/screen" + "github.com/micro-editor/micro/v2/internal/util" "github.com/micro-editor/tcell/v2" lua "github.com/yuin/gopher-lua" - "github.com/zyedidia/micro/v2/internal/buffer" - "github.com/zyedidia/micro/v2/internal/config" - "github.com/zyedidia/micro/v2/internal/display" - ulua "github.com/zyedidia/micro/v2/internal/lua" - "github.com/zyedidia/micro/v2/internal/screen" - "github.com/zyedidia/micro/v2/internal/util" ) type BufAction any diff --git a/internal/action/command.go b/internal/action/command.go index 1aafc1ab9d..7bbfe131d4 100644 --- a/internal/action/command.go +++ b/internal/action/command.go @@ -13,12 +13,12 @@ import ( "strings" 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" - "github.com/zyedidia/micro/v2/internal/util" + "github.com/micro-editor/micro/v2/internal/buffer" + "github.com/micro-editor/micro/v2/internal/clipboard" + "github.com/micro-editor/micro/v2/internal/config" + "github.com/micro-editor/micro/v2/internal/screen" + "github.com/micro-editor/micro/v2/internal/shell" + "github.com/micro-editor/micro/v2/internal/util" ) // A Command contains information about how to execute a command diff --git a/internal/action/globals.go b/internal/action/globals.go index 2b49f5bbc0..f5052b1c28 100644 --- a/internal/action/globals.go +++ b/internal/action/globals.go @@ -1,6 +1,6 @@ package action -import "github.com/zyedidia/micro/v2/internal/buffer" +import "github.com/micro-editor/micro/v2/internal/buffer" // InfoBar is the global info bar. var InfoBar *InfoPane diff --git a/internal/action/infocomplete.go b/internal/action/infocomplete.go index 3b90d5077e..ff227d8024 100644 --- a/internal/action/infocomplete.go +++ b/internal/action/infocomplete.go @@ -5,10 +5,10 @@ import ( "sort" "strings" - "github.com/zyedidia/micro/v2/internal/buffer" - "github.com/zyedidia/micro/v2/internal/config" - "github.com/zyedidia/micro/v2/internal/util" - "github.com/zyedidia/micro/v2/pkg/highlight" + "github.com/micro-editor/micro/v2/internal/buffer" + "github.com/micro-editor/micro/v2/internal/config" + "github.com/micro-editor/micro/v2/internal/util" + "github.com/micro-editor/micro/v2/pkg/highlight" ) // This file is meant (for now) for autocompletion in command mode, not diff --git a/internal/action/infopane.go b/internal/action/infopane.go index 4ebb1c0d85..6ecd955296 100644 --- a/internal/action/infopane.go +++ b/internal/action/infopane.go @@ -3,12 +3,12 @@ package action import ( "bytes" + "github.com/micro-editor/micro/v2/internal/buffer" + "github.com/micro-editor/micro/v2/internal/config" + "github.com/micro-editor/micro/v2/internal/display" + "github.com/micro-editor/micro/v2/internal/info" + "github.com/micro-editor/micro/v2/internal/util" "github.com/micro-editor/tcell/v2" - "github.com/zyedidia/micro/v2/internal/buffer" - "github.com/zyedidia/micro/v2/internal/config" - "github.com/zyedidia/micro/v2/internal/display" - "github.com/zyedidia/micro/v2/internal/info" - "github.com/zyedidia/micro/v2/internal/util" ) type InfoKeyAction func(*InfoPane) diff --git a/internal/action/pane.go b/internal/action/pane.go index 261215ca66..50ebcf6650 100644 --- a/internal/action/pane.go +++ b/internal/action/pane.go @@ -1,7 +1,7 @@ package action import ( - "github.com/zyedidia/micro/v2/internal/display" + "github.com/micro-editor/micro/v2/internal/display" ) // A Pane is a general interface for a window in the editor. diff --git a/internal/action/rawpane.go b/internal/action/rawpane.go index 512d93d9d9..e75e857789 100644 --- a/internal/action/rawpane.go +++ b/internal/action/rawpane.go @@ -4,9 +4,9 @@ import ( "fmt" "reflect" + "github.com/micro-editor/micro/v2/internal/buffer" + "github.com/micro-editor/micro/v2/internal/display" "github.com/micro-editor/tcell/v2" - "github.com/zyedidia/micro/v2/internal/buffer" - "github.com/zyedidia/micro/v2/internal/display" ) type RawPane struct { diff --git a/internal/action/tab.go b/internal/action/tab.go index 076df5f801..fa991f3e9a 100644 --- a/internal/action/tab.go +++ b/internal/action/tab.go @@ -3,13 +3,13 @@ package action import ( luar "layeh.com/gopher-luar" + "github.com/micro-editor/micro/v2/internal/buffer" + "github.com/micro-editor/micro/v2/internal/config" + "github.com/micro-editor/micro/v2/internal/display" + ulua "github.com/micro-editor/micro/v2/internal/lua" + "github.com/micro-editor/micro/v2/internal/screen" + "github.com/micro-editor/micro/v2/internal/views" "github.com/micro-editor/tcell/v2" - "github.com/zyedidia/micro/v2/internal/buffer" - "github.com/zyedidia/micro/v2/internal/config" - "github.com/zyedidia/micro/v2/internal/display" - ulua "github.com/zyedidia/micro/v2/internal/lua" - "github.com/zyedidia/micro/v2/internal/screen" - "github.com/zyedidia/micro/v2/internal/views" ) // The TabList is a list of tabs and a window to display the tab bar diff --git a/internal/action/terminal_supported.go b/internal/action/terminal_supported.go index e24ae71df3..b8e125cb41 100644 --- a/internal/action/terminal_supported.go +++ b/internal/action/terminal_supported.go @@ -4,7 +4,7 @@ package action import ( shellquote "github.com/kballard/go-shellquote" - "github.com/zyedidia/micro/v2/internal/shell" + "github.com/micro-editor/micro/v2/internal/shell" ) // TermEmuSupported is a constant that marks if the terminal emulator is supported diff --git a/internal/action/termpane.go b/internal/action/termpane.go index 2eea819fda..4a0d71e937 100644 --- a/internal/action/termpane.go +++ b/internal/action/termpane.go @@ -4,13 +4,13 @@ import ( "errors" "runtime" + "github.com/micro-editor/micro/v2/internal/clipboard" + "github.com/micro-editor/micro/v2/internal/config" + "github.com/micro-editor/micro/v2/internal/display" + "github.com/micro-editor/micro/v2/internal/screen" + "github.com/micro-editor/micro/v2/internal/shell" "github.com/micro-editor/tcell/v2" "github.com/micro-editor/terminal" - "github.com/zyedidia/micro/v2/internal/clipboard" - "github.com/zyedidia/micro/v2/internal/config" - "github.com/zyedidia/micro/v2/internal/display" - "github.com/zyedidia/micro/v2/internal/screen" - "github.com/zyedidia/micro/v2/internal/shell" ) type TermKeyAction func(*TermPane) diff --git a/internal/buffer/autocomplete.go b/internal/buffer/autocomplete.go index 0cd83eabc9..6dcda4da51 100644 --- a/internal/buffer/autocomplete.go +++ b/internal/buffer/autocomplete.go @@ -7,7 +7,7 @@ import ( "sort" "strings" - "github.com/zyedidia/micro/v2/internal/util" + "github.com/micro-editor/micro/v2/internal/util" ) // A Completer is a function that takes a buffer and returns info diff --git a/internal/buffer/backup.go b/internal/buffer/backup.go index 43daa2860b..a29b4177c5 100644 --- a/internal/buffer/backup.go +++ b/internal/buffer/backup.go @@ -7,9 +7,9 @@ import ( "os" "path/filepath" - "github.com/zyedidia/micro/v2/internal/config" - "github.com/zyedidia/micro/v2/internal/screen" - "github.com/zyedidia/micro/v2/internal/util" + "github.com/micro-editor/micro/v2/internal/config" + "github.com/micro-editor/micro/v2/internal/screen" + "github.com/micro-editor/micro/v2/internal/util" ) const BackupMsg = `A backup was detected for: diff --git a/internal/buffer/buffer.go b/internal/buffer/buffer.go index ce36988bb1..2735ca467c 100644 --- a/internal/buffer/buffer.go +++ b/internal/buffer/buffer.go @@ -17,12 +17,12 @@ import ( luar "layeh.com/gopher-luar" + "github.com/micro-editor/micro/v2/internal/config" + ulua "github.com/micro-editor/micro/v2/internal/lua" + "github.com/micro-editor/micro/v2/internal/screen" + "github.com/micro-editor/micro/v2/internal/util" + "github.com/micro-editor/micro/v2/pkg/highlight" dmp "github.com/sergi/go-diff/diffmatchpatch" - "github.com/zyedidia/micro/v2/internal/config" - ulua "github.com/zyedidia/micro/v2/internal/lua" - "github.com/zyedidia/micro/v2/internal/screen" - "github.com/zyedidia/micro/v2/internal/util" - "github.com/zyedidia/micro/v2/pkg/highlight" "golang.org/x/text/encoding" "golang.org/x/text/encoding/htmlindex" "golang.org/x/text/encoding/unicode" diff --git a/internal/buffer/buffer_test.go b/internal/buffer/buffer_test.go index 7d7602e444..6f3d5ce776 100644 --- a/internal/buffer/buffer_test.go +++ b/internal/buffer/buffer_test.go @@ -5,11 +5,11 @@ import ( "strings" "testing" + "github.com/micro-editor/micro/v2/internal/config" + ulua "github.com/micro-editor/micro/v2/internal/lua" + "github.com/micro-editor/micro/v2/internal/util" "github.com/stretchr/testify/assert" lua "github.com/yuin/gopher-lua" - "github.com/zyedidia/micro/v2/internal/config" - ulua "github.com/zyedidia/micro/v2/internal/lua" - "github.com/zyedidia/micro/v2/internal/util" ) type operation struct { diff --git a/internal/buffer/cursor.go b/internal/buffer/cursor.go index f6eb91af7e..7c229fd3e4 100644 --- a/internal/buffer/cursor.go +++ b/internal/buffer/cursor.go @@ -1,8 +1,8 @@ package buffer import ( - "github.com/zyedidia/micro/v2/internal/clipboard" - "github.com/zyedidia/micro/v2/internal/util" + "github.com/micro-editor/micro/v2/internal/clipboard" + "github.com/micro-editor/micro/v2/internal/util" ) // InBounds returns whether the given location is a valid character position in the given buffer diff --git a/internal/buffer/eventhandler.go b/internal/buffer/eventhandler.go index e739f25011..87b2a73a27 100644 --- a/internal/buffer/eventhandler.go +++ b/internal/buffer/eventhandler.go @@ -4,11 +4,11 @@ import ( "bytes" "time" + "github.com/micro-editor/micro/v2/internal/config" + ulua "github.com/micro-editor/micro/v2/internal/lua" + "github.com/micro-editor/micro/v2/internal/screen" + "github.com/micro-editor/micro/v2/internal/util" dmp "github.com/sergi/go-diff/diffmatchpatch" - "github.com/zyedidia/micro/v2/internal/config" - ulua "github.com/zyedidia/micro/v2/internal/lua" - "github.com/zyedidia/micro/v2/internal/screen" - "github.com/zyedidia/micro/v2/internal/util" luar "layeh.com/gopher-luar" ) diff --git a/internal/buffer/line_array.go b/internal/buffer/line_array.go index b65213b805..eecb6b5904 100644 --- a/internal/buffer/line_array.go +++ b/internal/buffer/line_array.go @@ -6,8 +6,8 @@ import ( "io" "sync" - "github.com/zyedidia/micro/v2/internal/util" - "github.com/zyedidia/micro/v2/pkg/highlight" + "github.com/micro-editor/micro/v2/internal/util" + "github.com/micro-editor/micro/v2/pkg/highlight" ) // Finds the byte index of the nth rune in a byte slice diff --git a/internal/buffer/loc.go b/internal/buffer/loc.go index d59578071d..5566a7f9a8 100644 --- a/internal/buffer/loc.go +++ b/internal/buffer/loc.go @@ -1,7 +1,7 @@ package buffer import ( - "github.com/zyedidia/micro/v2/internal/util" + "github.com/micro-editor/micro/v2/internal/util" ) // Loc stores a location diff --git a/internal/buffer/message.go b/internal/buffer/message.go index f0d12249b2..b2ab4e3473 100644 --- a/internal/buffer/message.go +++ b/internal/buffer/message.go @@ -1,8 +1,8 @@ package buffer import ( + "github.com/micro-editor/micro/v2/internal/config" "github.com/micro-editor/tcell/v2" - "github.com/zyedidia/micro/v2/internal/config" ) type MsgType int diff --git a/internal/buffer/save.go b/internal/buffer/save.go index 16e6ed31dc..44e8f4a3ed 100644 --- a/internal/buffer/save.go +++ b/internal/buffer/save.go @@ -14,9 +14,9 @@ import ( "time" "unicode" - "github.com/zyedidia/micro/v2/internal/config" - "github.com/zyedidia/micro/v2/internal/screen" - "github.com/zyedidia/micro/v2/internal/util" + "github.com/micro-editor/micro/v2/internal/config" + "github.com/micro-editor/micro/v2/internal/screen" + "github.com/micro-editor/micro/v2/internal/util" "golang.org/x/text/transform" ) diff --git a/internal/buffer/search.go b/internal/buffer/search.go index fd95f644ba..3f4f0dad3e 100644 --- a/internal/buffer/search.go +++ b/internal/buffer/search.go @@ -4,7 +4,7 @@ import ( "regexp" "unicode/utf8" - "github.com/zyedidia/micro/v2/internal/util" + "github.com/micro-editor/micro/v2/internal/util" ) // We want "^" and "$" to match only the beginning/end of a line, not the diff --git a/internal/buffer/serialize.go b/internal/buffer/serialize.go index c765ca93a8..e358eb3d03 100644 --- a/internal/buffer/serialize.go +++ b/internal/buffer/serialize.go @@ -8,8 +8,8 @@ import ( "path/filepath" "time" - "github.com/zyedidia/micro/v2/internal/config" - "github.com/zyedidia/micro/v2/internal/util" + "github.com/micro-editor/micro/v2/internal/config" + "github.com/micro-editor/micro/v2/internal/util" ) // The SerializedBuffer holds the types that get serialized when a buffer is saved diff --git a/internal/buffer/settings.go b/internal/buffer/settings.go index 48be3306bd..e2178726ce 100644 --- a/internal/buffer/settings.go +++ b/internal/buffer/settings.go @@ -4,9 +4,9 @@ import ( "crypto/md5" "reflect" - "github.com/zyedidia/micro/v2/internal/config" - ulua "github.com/zyedidia/micro/v2/internal/lua" - "github.com/zyedidia/micro/v2/internal/screen" + "github.com/micro-editor/micro/v2/internal/config" + ulua "github.com/micro-editor/micro/v2/internal/lua" + "github.com/micro-editor/micro/v2/internal/screen" "golang.org/x/text/encoding/htmlindex" "golang.org/x/text/encoding/unicode" luar "layeh.com/gopher-luar" diff --git a/internal/clipboard/terminal.go b/internal/clipboard/terminal.go index 1d5a4be25c..fac159cd31 100644 --- a/internal/clipboard/terminal.go +++ b/internal/clipboard/terminal.go @@ -4,8 +4,8 @@ import ( "errors" "time" + "github.com/micro-editor/micro/v2/internal/screen" "github.com/micro-editor/tcell/v2" - "github.com/zyedidia/micro/v2/internal/screen" ) type terminalClipboard struct{} diff --git a/internal/config/plugin.go b/internal/config/plugin.go index 12a2c968f0..931e773ee0 100644 --- a/internal/config/plugin.go +++ b/internal/config/plugin.go @@ -4,8 +4,8 @@ import ( "errors" "log" + ulua "github.com/micro-editor/micro/v2/internal/lua" lua "github.com/yuin/gopher-lua" - ulua "github.com/zyedidia/micro/v2/internal/lua" ) // ErrNoSuchFunction is returned when Call is executed on a function that does not exist diff --git a/internal/config/plugin_installer.go b/internal/config/plugin_installer.go index 8589985208..ea14e42b44 100644 --- a/internal/config/plugin_installer.go +++ b/internal/config/plugin_installer.go @@ -14,9 +14,9 @@ import ( "github.com/blang/semver" "github.com/micro-editor/json5" + ulua "github.com/micro-editor/micro/v2/internal/lua" + "github.com/micro-editor/micro/v2/internal/util" lua "github.com/yuin/gopher-lua" - ulua "github.com/zyedidia/micro/v2/internal/lua" - "github.com/zyedidia/micro/v2/internal/util" ) var ( diff --git a/internal/config/rtfiles.go b/internal/config/rtfiles.go index 8cb598fa11..70ce4f04c6 100644 --- a/internal/config/rtfiles.go +++ b/internal/config/rtfiles.go @@ -8,7 +8,7 @@ import ( "regexp" "strings" - rt "github.com/zyedidia/micro/v2/runtime" + rt "github.com/micro-editor/micro/v2/runtime" ) const ( diff --git a/internal/config/settings.go b/internal/config/settings.go index 800d2d1413..b7097087a9 100644 --- a/internal/config/settings.go +++ b/internal/config/settings.go @@ -12,8 +12,8 @@ import ( "strings" "github.com/micro-editor/json5" + "github.com/micro-editor/micro/v2/internal/util" "github.com/zyedidia/glob" - "github.com/zyedidia/micro/v2/internal/util" "golang.org/x/text/encoding/htmlindex" ) diff --git a/internal/display/bufwindow.go b/internal/display/bufwindow.go index 369ea35ba3..2a317a513e 100644 --- a/internal/display/bufwindow.go +++ b/internal/display/bufwindow.go @@ -5,11 +5,11 @@ import ( "strings" runewidth "github.com/mattn/go-runewidth" + "github.com/micro-editor/micro/v2/internal/buffer" + "github.com/micro-editor/micro/v2/internal/config" + "github.com/micro-editor/micro/v2/internal/screen" + "github.com/micro-editor/micro/v2/internal/util" "github.com/micro-editor/tcell/v2" - "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" ) // The BufWindow provides a way of displaying a certain section of a buffer. diff --git a/internal/display/infowindow.go b/internal/display/infowindow.go index afc0c53ff7..39ca72778a 100644 --- a/internal/display/infowindow.go +++ b/internal/display/infowindow.go @@ -2,12 +2,12 @@ package display import ( runewidth "github.com/mattn/go-runewidth" + "github.com/micro-editor/micro/v2/internal/buffer" + "github.com/micro-editor/micro/v2/internal/config" + "github.com/micro-editor/micro/v2/internal/info" + "github.com/micro-editor/micro/v2/internal/screen" + "github.com/micro-editor/micro/v2/internal/util" "github.com/micro-editor/tcell/v2" - "github.com/zyedidia/micro/v2/internal/buffer" - "github.com/zyedidia/micro/v2/internal/config" - "github.com/zyedidia/micro/v2/internal/info" - "github.com/zyedidia/micro/v2/internal/screen" - "github.com/zyedidia/micro/v2/internal/util" ) type InfoWindow struct { diff --git a/internal/display/softwrap.go b/internal/display/softwrap.go index 1460f88304..7c36a3bb10 100644 --- a/internal/display/softwrap.go +++ b/internal/display/softwrap.go @@ -2,8 +2,8 @@ package display import ( runewidth "github.com/mattn/go-runewidth" - "github.com/zyedidia/micro/v2/internal/buffer" - "github.com/zyedidia/micro/v2/internal/util" + "github.com/micro-editor/micro/v2/internal/buffer" + "github.com/micro-editor/micro/v2/internal/util" ) // SLoc represents a vertical scrolling location, i.e. a location of a visual line diff --git a/internal/display/statusline.go b/internal/display/statusline.go index 409f862caa..3500355b13 100644 --- a/internal/display/statusline.go +++ b/internal/display/statusline.go @@ -10,12 +10,12 @@ import ( luar "layeh.com/gopher-luar" runewidth "github.com/mattn/go-runewidth" + "github.com/micro-editor/micro/v2/internal/buffer" + "github.com/micro-editor/micro/v2/internal/config" + ulua "github.com/micro-editor/micro/v2/internal/lua" + "github.com/micro-editor/micro/v2/internal/screen" + "github.com/micro-editor/micro/v2/internal/util" lua "github.com/yuin/gopher-lua" - "github.com/zyedidia/micro/v2/internal/buffer" - "github.com/zyedidia/micro/v2/internal/config" - ulua "github.com/zyedidia/micro/v2/internal/lua" - "github.com/zyedidia/micro/v2/internal/screen" - "github.com/zyedidia/micro/v2/internal/util" ) // StatusLine represents the information line at the bottom diff --git a/internal/display/tabwindow.go b/internal/display/tabwindow.go index 844f12e922..ad57963baf 100644 --- a/internal/display/tabwindow.go +++ b/internal/display/tabwindow.go @@ -2,11 +2,11 @@ package display import ( runewidth "github.com/mattn/go-runewidth" + "github.com/micro-editor/micro/v2/internal/buffer" + "github.com/micro-editor/micro/v2/internal/config" + "github.com/micro-editor/micro/v2/internal/screen" + "github.com/micro-editor/micro/v2/internal/util" "github.com/micro-editor/tcell/v2" - "github.com/zyedidia/micro/v2/internal/buffer" - "github.com/zyedidia/micro/v2/internal/config" - "github.com/zyedidia/micro/v2/internal/screen" - "github.com/zyedidia/micro/v2/internal/util" ) type TabWindow struct { diff --git a/internal/display/termwindow.go b/internal/display/termwindow.go index 40d051c6f5..0dcea5a857 100644 --- a/internal/display/termwindow.go +++ b/internal/display/termwindow.go @@ -1,13 +1,13 @@ package display import ( + "github.com/micro-editor/micro/v2/internal/buffer" + "github.com/micro-editor/micro/v2/internal/config" + "github.com/micro-editor/micro/v2/internal/screen" + "github.com/micro-editor/micro/v2/internal/shell" + "github.com/micro-editor/micro/v2/internal/util" "github.com/micro-editor/tcell/v2" "github.com/micro-editor/terminal" - "github.com/zyedidia/micro/v2/internal/buffer" - "github.com/zyedidia/micro/v2/internal/config" - "github.com/zyedidia/micro/v2/internal/screen" - "github.com/zyedidia/micro/v2/internal/shell" - "github.com/zyedidia/micro/v2/internal/util" ) type TermWindow struct { diff --git a/internal/display/uiwindow.go b/internal/display/uiwindow.go index 60c4dc7e89..b1b9b33719 100644 --- a/internal/display/uiwindow.go +++ b/internal/display/uiwindow.go @@ -1,11 +1,11 @@ package display 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" + "github.com/micro-editor/micro/v2/internal/buffer" + "github.com/micro-editor/micro/v2/internal/config" + "github.com/micro-editor/micro/v2/internal/screen" + "github.com/micro-editor/micro/v2/internal/util" + "github.com/micro-editor/micro/v2/internal/views" ) type UIWindow struct { diff --git a/internal/display/window.go b/internal/display/window.go index a321cf4f01..f7e36f81be 100644 --- a/internal/display/window.go +++ b/internal/display/window.go @@ -1,7 +1,7 @@ package display import ( - "github.com/zyedidia/micro/v2/internal/buffer" + "github.com/micro-editor/micro/v2/internal/buffer" ) type View struct { diff --git a/internal/info/history.go b/internal/info/history.go index ec94695735..0a48a59ed2 100644 --- a/internal/info/history.go +++ b/internal/info/history.go @@ -9,9 +9,9 @@ import ( "path/filepath" "strings" - "github.com/zyedidia/micro/v2/internal/config" - "github.com/zyedidia/micro/v2/internal/screen" - "github.com/zyedidia/micro/v2/internal/util" + "github.com/micro-editor/micro/v2/internal/config" + "github.com/micro-editor/micro/v2/internal/screen" + "github.com/micro-editor/micro/v2/internal/util" ) // LoadHistory attempts to load user history from configDir/buffers/history diff --git a/internal/info/infobuffer.go b/internal/info/infobuffer.go index e4d3ff82c5..9eb3c365cd 100644 --- a/internal/info/infobuffer.go +++ b/internal/info/infobuffer.go @@ -3,7 +3,7 @@ package info import ( "fmt" - "github.com/zyedidia/micro/v2/internal/buffer" + "github.com/micro-editor/micro/v2/internal/buffer" ) // The InfoBuf displays messages and other info at the bottom of the screen. diff --git a/internal/screen/screen.go b/internal/screen/screen.go index a0bd93eb35..4b2c564249 100644 --- a/internal/screen/screen.go +++ b/internal/screen/screen.go @@ -6,8 +6,8 @@ import ( "os" "sync" + "github.com/micro-editor/micro/v2/internal/config" "github.com/micro-editor/tcell/v2" - "github.com/zyedidia/micro/v2/internal/config" ) // Screen is the tcell screen we use to draw to the terminal diff --git a/internal/shell/shell.go b/internal/shell/shell.go index 9149da9f79..f1d206dc78 100644 --- a/internal/shell/shell.go +++ b/internal/shell/shell.go @@ -10,8 +10,8 @@ import ( "os/signal" shellquote "github.com/kballard/go-shellquote" - "github.com/zyedidia/micro/v2/internal/screen" - "github.com/zyedidia/micro/v2/internal/util" + "github.com/micro-editor/micro/v2/internal/screen" + "github.com/micro-editor/micro/v2/internal/util" ) // ExecCommand executes a command using exec diff --git a/internal/shell/terminal.go b/internal/shell/terminal.go index 6be4ac5208..e348f57a91 100644 --- a/internal/shell/terminal.go +++ b/internal/shell/terminal.go @@ -5,9 +5,9 @@ import ( "os/exec" "strconv" + "github.com/micro-editor/micro/v2/internal/buffer" + "github.com/micro-editor/micro/v2/internal/screen" "github.com/micro-editor/terminal" - "github.com/zyedidia/micro/v2/internal/buffer" - "github.com/zyedidia/micro/v2/internal/screen" ) type TermType int diff --git a/runtime/help/colors.md b/runtime/help/colors.md index c085919a93..7437108731 100644 --- a/runtime/help/colors.md +++ b/runtime/help/colors.md @@ -99,7 +99,7 @@ is supported for backward compatibility). Micro's colorschemes are also extremely simple to create. The default ones can be found -[here](https://github.com/zyedidia/micro/tree/master/runtime/colorschemes). +[here](https://github.com/micro-editor/micro/tree/master/runtime/colorschemes). Custom colorschemes should be placed in the `~/.config/micro/colorschemes` directory. diff --git a/runtime/help/options.md b/runtime/help/options.md index 85f25e8b38..706881a5e7 100644 --- a/runtime/help/options.md +++ b/runtime/help/options.md @@ -482,9 +482,9 @@ Here are the available options: default value: `4` * `tabstospaces`: use spaces instead of tabs. Note: This option will be - overridden by [the `ftoptions` plugin](https://github.com/zyedidia/micro/blob/master/runtime/plugins/ftoptions/ftoptions.lua) + overridden by [the `ftoptions` plugin](https://github.com/micro-editor/micro/blob/master/runtime/plugins/ftoptions/ftoptions.lua) for certain filetypes. To disable this behavior, add `"ftoptions": false` to - your config. See [issue #2213](https://github.com/zyedidia/micro/issues/2213) + your config. See [issue #2213](https://github.com/micro-editor/micro/issues/2213) for more details. default value: `false` diff --git a/runtime/help/plugins.md b/runtime/help/plugins.md index 11170507e9..27d099973a 100644 --- a/runtime/help/plugins.md +++ b/runtime/help/plugins.md @@ -153,10 +153,10 @@ The packages and their contents are listed below (in Go type signatures): Relevant links: [Time](https://pkg.go.dev/time#Duration) - [BufPane](https://pkg.go.dev/github.com/zyedidia/micro/v2/internal/action#BufPane) - [InfoPane](https://pkg.go.dev/github.com/zyedidia/micro/v2/internal/action#InfoPane) - [Tab](https://pkg.go.dev/github.com/zyedidia/micro/v2/internal/action#Tab) - [TabList](https://pkg.go.dev/github.com/zyedidia/micro/v2/internal/action#TabList) + [BufPane](https://pkg.go.dev/github.com/micro-editor/micro/v2/internal/action#BufPane) + [InfoPane](https://pkg.go.dev/github.com/micro-editor/micro/v2/internal/action#InfoPane) + [Tab](https://pkg.go.dev/github.com/micro-editor/micro/v2/internal/action#Tab) + [TabList](https://pkg.go.dev/github.com/micro-editor/micro/v2/internal/action#TabList) * `micro/config` - `MakeCommand(name string, action func(bp *BufPane, args[]string), @@ -237,8 +237,8 @@ The packages and their contents are listed below (in Go type signatures): - `ConfigDir`: the path to micro's currently active config directory. Relevant links: - [Buffer](https://pkg.go.dev/github.com/zyedidia/micro/v2/internal/buffer#Buffer) - [buffer.Completer](https://pkg.go.dev/github.com/zyedidia/micro/v2/internal/buffer#Completer) + [Buffer](https://pkg.go.dev/github.com/micro-editor/micro/v2/internal/buffer#Buffer) + [buffer.Completer](https://pkg.go.dev/github.com/micro-editor/micro/v2/internal/buffer#Completer) [Error](https://pkg.go.dev/builtin#error) [filepath.Match](https://pkg.go.dev/path/filepath#Match) @@ -304,7 +304,7 @@ The packages and their contents are listed below (in Go type signatures): Relevant links: [Cmd](https://pkg.go.dev/os/exec#Cmd) - [BufPane](https://pkg.go.dev/github.com/zyedidia/micro/v2/internal/action#BufPane) + [BufPane](https://pkg.go.dev/github.com/micro-editor/micro/v2/internal/action#BufPane) [Error](https://pkg.go.dev/builtin#error) * `micro/buffer` @@ -345,10 +345,10 @@ The packages and their contents are listed below (in Go type signatures): - `LogBuf() *Buffer`: returns the log buffer. Relevant links: - [Message](https://pkg.go.dev/github.com/zyedidia/micro/v2/internal/buffer#Message) - [Loc](https://pkg.go.dev/github.com/zyedidia/micro/v2/internal/buffer#Loc) - [display.SLoc](https://pkg.go.dev/github.com/zyedidia/micro/v2/internal/display#SLoc) - [Buffer](https://pkg.go.dev/github.com/zyedidia/micro/v2/internal/buffer#Buffer) + [Message](https://pkg.go.dev/github.com/micro-editor/micro/v2/internal/buffer#Message) + [Loc](https://pkg.go.dev/github.com/micro-editor/micro/v2/internal/buffer#Loc) + [display.SLoc](https://pkg.go.dev/github.com/micro-editor/micro/v2/internal/display#SLoc) + [Buffer](https://pkg.go.dev/github.com/micro-editor/micro/v2/internal/buffer#Buffer) [Error](https://pkg.go.dev/builtin#error) * `micro/util` @@ -376,7 +376,7 @@ returned by the functions have many methods. The Lua plugin may access any public methods of an object returned by any of the functions above. Unfortunately, it is not possible to list all the available functions on this page. Please go to the internal documentation at -https://pkg.go.dev/github.com/zyedidia/micro/v2/internal to see the full list +https://pkg.go.dev/github.com/micro-editor/micro/v2/internal to see the full list of available methods. Note that only methods of types that are available to plugins via the functions above can be called from a plugin. For an even more detailed reference, see the source code on Github. diff --git a/runtime/syntax/octave.yaml b/runtime/syntax/octave.yaml index 03df6fff4b..ce740a2a34 100644 --- a/runtime/syntax/octave.yaml +++ b/runtime/syntax/octave.yaml @@ -1,5 +1,5 @@ # References -# https://github.com/zyedidia/micro/blob/master/runtime/syntax/go.yaml +# https://github.com/micro-editor/micro/blob/master/runtime/syntax/go.yaml # https://github.com/vim-scripts/octave.vim--/blob/master/syntax/octave.vim # # TODO diff --git a/tools/remove-nightly-assets.go b/tools/remove-nightly-assets.go index 9f06f5f487..e12d6c5937 100644 --- a/tools/remove-nightly-assets.go +++ b/tools/remove-nightly-assets.go @@ -13,7 +13,7 @@ import ( ) func main() { - resp, err := http.Get("https://api.github.com/repos/zyedidia/micro/releases") + resp, err := http.Get("https://api.github.com/repos/micro-editor/micro/releases") if err != nil { fmt.Println(err.Error()) return