Merge branch 'master'

Author: mroldao

.editorconfig

@@ -1,7 +1,6 @@
-# See http://editorconfig.org
+# See https://editorconfig.org
 
 # In Go files we indent with tabs but still 
 # set indent_size to control the GitHub web viewer.  
 [*.go]
 indent_size=4
-

.github/workflows/test.yaml

@@ -4,7 +4,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.17.x, 1.23.x]
+        go-version: [1.19.x, 1.23.x]
         os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:

.gitignore

@@ -1,6 +1,7 @@
 .DS_Store
 
 micro
+micro.exe
 !cmd/micro
 binaries/
 tmp.sh

LICENSE-THIRD-PARTY

@@ -430,7 +430,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 github.com/gdamore/tcell/LICENSE
 ================
-github.com/zyedidia/tcell/LICENSE (fork)
+github.com/micro-editor/tcell/LICENSE (fork)
 ================
 
 
@@ -1048,7 +1048,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
 
 github.com/flynn/json5/LICENSE
 ================
-github.com/zyedidia/json5/LICENSE (fork)
+github.com/micro-editor/json5/LICENSE (fork)
 ================
 
 Decoder code based on package encoding/json from the Go language.
@@ -1108,7 +1108,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 github.com/james4k/terminal/LICENSE
 ================
-github.com/zyedidia/terminal/LICENSE (fork)
+github.com/micro-editor/terminal/LICENSE (fork)
 ================
 
 Copyright (C) 2013 James Gray

README.md

@@ -1,7 +1,7 @@
 <img alt="micro logo" src="./assets/micro-logo-drop.svg" width="500px"/>
 
 ![Test Workflow](https://github.com/zyedidia/micro/actions/workflows/test.yaml/badge.svg)
-[![Go Report Card](https://goreportcard.com/badge/github.com/zyedidia/micro)](https://goreportcard.com/report/github.com/zyedidia/micro)
+[![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)
 [![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)
@@ -47,7 +47,7 @@ You can also check out the website for Micro at https://micro-editor.github.io.
 - Syntax highlighting for over [130 languages](runtime/syntax).
 - Color scheme support.
   - By default, micro comes with 16, 256, and true color themes.
-- True color support (set the `MICRO_TRUECOLOR` environment variable to 1 to enable it).
+- True color support.
 - Copy and paste with the system clipboard.
 - Small and simple.
 - Easily configurable.
@@ -142,7 +142,7 @@ for other operating systems. These packages are not guaranteed to be up-to-date.
     * `winget install zyedidia.micro`
 * OpenBSD: Available in the ports tree and also available as a binary package.
     * `pkg_add -v micro`.
-* NetBSD, macOS, Linux, Illumos, etc. with [pkgsrc](http://www.pkgsrc.org/)-current:
+* NetBSD, macOS, Linux, Illumos, etc. with [pkgsrc](https://www.pkgsrc.org/)-current:
     * `pkg_add micro`
 * macOS: Available in package managers.
     * `sudo port install micro` (with [MacPorts](https://www.macports.org))
@@ -162,7 +162,7 @@ Without these tools installed, micro will use an internal clipboard for copy and
 
 If your operating system does not have a binary release, but does run Go, you can build from source.
 
-Make sure that you have Go version 1.17 or greater and Go modules are enabled.
+Make sure that you have Go version 1.19 or greater and Go modules are enabled.
 
 ```
 git clone https://github.com/zyedidia/micro
@@ -196,7 +196,7 @@ Native macOS builds are done with `CGO_ENABLED=1` forced set to support adding t
 
 ### 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->Presets...`, and select `Esc+` for `Left Option Key` in the same menu. The newest versions also support true color.
+If you are using macOS, you should consider using [iTerm2](https://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>.

assets/packaging/micro.1

@@ -1,87 +1,104 @@
-.TH micro 1 "2020-02-10"
+.TH micro 1 "2025-09-03"
 .SH NAME
 micro \- A modern and intuitive terminal-based text editor
 .SH SYNOPSIS
 .B micro
-.RB [OPTIONS]
-[FILE]\&...
-
+.RI [ OPTION ]...\&
+.RI [ FILE ]...\&
+.RI [+ LINE [: COL ]]\&
+.RI [+/ REGEX ]
+.br
+.B micro
+.RI [ OPTION ]...\&
+.RI [ FILE [: LINE [: COL ]]]...\&
+\& (only if the `parsecursor` option is enabled)
 .SH DESCRIPTION
-
 Micro is a terminal-based text editor that aims to be easy to use and intuitive, while also taking advantage of the full capabilities
 of modern terminals. It comes as one single, batteries-included, static binary with no dependencies.
 
 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
+.B \-clean
 .RS 4
-Cleans the configuration directory
+Clean the configuration directory and exit
 .RE
-
 .PP
-\-config-dir dir
+.B \-config-dir
+.I dir
 .RS 4
 Specify a custom location for the configuration directory
 .RE
-
 .PP
-[FILE]:LINE:COL
+.IR FILE : LINE [: COL ]
+(only if the `parsecursor` option is enabled)
+.br
+.IR FILE \ + LINE [: COL ]
 .RS 4
 Specify a line and column to start the cursor at when opening a buffer
 .RE
-
 .PP
-\-options
+.RI +/ REGEX
 .RS 4
-Show all option help
+Specify a regex to search for when opening a buffer
 .RE
-
 .PP
-\-debug
+.B \-options
+.RS 4
+Show all options help and exit
+.RE
+.PP
+.B \-debug
 .RS 4
 Enable debug mode (enables logging to ./log.txt)
 .RE
-
 .PP
-\-version
+.B \-profile
 .RS 4
-Show the version number and information
+Enable CPU profiling (writes profile info to ./micro.prof so it can be analyzed later with "go tool pprof micro.prof")
+.RE
+.PP
+.B \-version
+.RS 4
+Show the version number and information and exit
 .RE
 
 Micro's plugins can be managed at the command line with the following commands.
 .RS 4
-
 .PP
-\-plugin remove [PLUGIN]...
+.B \-plugin install
+.RI [ PLUGIN ]...
+.RS 4
+Install plugin(s)
+.RE
+.PP
+.B \-plugin remove
+.RI [ PLUGIN ]...
 .RS 4
 Remove plugin(s)
 .RE
-
 .PP
-\-plugin update [PLUGIN]...
+.B \-plugin update
+.RI [ PLUGIN ]...
 .RS 4
 Update plugin(s) (if no argument is given, updates all plugins)
 .RE
-
 .PP
-\-plugin search [PLUGIN]...
+.B \-plugin search
+.RI [ PLUGIN ]...
 .RS 4
 Search for a plugin
 .RE
-
 .PP
-\-plugin list
+.B \-plugin list
 .RS 4
 List installed plugins
 .RE
-
 .PP
-\-plugin available
+.B \-plugin available
 .RS 4
 List available plugins
 .RE
@@ -91,35 +108,33 @@ Micro's options can also be set via command line arguments for quick
 adjustments. For real configuration, please use the settings.json
 file (see 'help options').
 .RS 4
-
 .PP
-\-option value
+.BI \-< option >
+.I value
 .RS 4
-Set `option` to `value` for this session
+Set `option` to `value` for this session.
+.br
 For example: `micro -syntax off file.c`
 .RE
-
-
+.RE
+.PP
+Use `micro -options` to see the full list of configuration options.
 .SH CONFIGURATION
-
 Micro uses $MICRO_CONFIG_HOME as the configuration directory.
 If this environment variable is not set, it uses $XDG_CONFIG_HOME/micro instead.
 If that environment variable is not set, it uses ~/.config/micro as the configuration directory.
 In the documentation, we use ~/.config/micro to refer to the configuration directory
 (even if it may in fact be somewhere else if you have set either of the above environment variables).
-
 .SH NOTICE
 This manpage is intended only to serve as a quick guide to the invocation of 
 micro and is not intended to replace the full documentation included with micro
 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
 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.

cmd/micro/clean.go

@@ -3,15 +3,16 @@ package main
 import (
 	"bufio"
 	"encoding/gob"
+	"errors"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"sort"
 	"strings"
 
 	"github.com/zyedidia/micro/v2/internal/buffer"
 	"github.com/zyedidia/micro/v2/internal/config"
+	"github.com/zyedidia/micro/v2/internal/util"
 )
 
 func shouldContinue() bool {
@@ -39,7 +40,16 @@ func CleanConfig() {
 	}
 
 	fmt.Println("Cleaning default settings")
-	config.WriteSettings(filepath.Join(config.ConfigDir, "settings.json"))
+
+	settingsFile := filepath.Join(config.ConfigDir, "settings.json")
+	err := config.WriteSettings(settingsFile)
+	if err != nil {
+		if errors.Is(err, util.ErrOverwrite) {
+			fmt.Println(err.Error())
+		} else {
+			fmt.Println("Error writing settings.json file: " + err.Error())
+		}
+	}
 
 	// detect unused options
 	var unusedOptions []string
@@ -67,16 +77,20 @@ func CleanConfig() {
 			fmt.Printf("%s (value: %v)\n", s, config.GlobalSettings[s])
 		}
 
-		fmt.Printf("These options will be removed from %s\n", filepath.Join(config.ConfigDir, "settings.json"))
+		fmt.Printf("These options will be removed from %s\n", settingsFile)
 
 		if shouldContinue() {
 			for _, s := range unusedOptions {
 				delete(config.GlobalSettings, s)
 			}
 
-			err := config.OverwriteSettings(filepath.Join(config.ConfigDir, "settings.json"))
+			err := config.OverwriteSettings(settingsFile)
 			if err != nil {
-				fmt.Println("Error writing settings.json file: " + err.Error())
+				if errors.Is(err, util.ErrOverwrite) {
+					fmt.Println(err.Error())
+				} else {
+					fmt.Println("Error overwriting settings.json file: " + err.Error())
+				}
 			}
 
 			fmt.Println("Removed unused options")
@@ -85,12 +99,13 @@ func CleanConfig() {
 	}
 
 	// detect incorrectly formatted buffer/ files
-	files, err := ioutil.ReadDir(filepath.Join(config.ConfigDir, "buffers"))
+	buffersPath := filepath.Join(config.ConfigDir, "buffers")
+	files, err := os.ReadDir(buffersPath)
 	if err == nil {
 		var badFiles []string
 		var buffer buffer.SerializedBuffer
 		for _, f := range files {
-			fname := filepath.Join(config.ConfigDir, "buffers", f.Name())
+			fname := filepath.Join(buffersPath, f.Name())
 			file, e := os.Open(fname)
 
 			if e == nil {
@@ -105,9 +120,9 @@ func CleanConfig() {
 		}
 
 		if len(badFiles) > 0 {
-			fmt.Printf("Detected %d files with an invalid format in %s\n", len(badFiles), filepath.Join(config.ConfigDir, "buffers"))
+			fmt.Printf("Detected %d files with an invalid format in %s\n", len(badFiles), buffersPath)
 			fmt.Println("These files store cursor and undo history.")
-			fmt.Printf("Removing badly formatted files in %s\n", filepath.Join(config.ConfigDir, "buffers"))
+			fmt.Printf("Removing badly formatted files in %s\n", buffersPath)
 
 			if shouldContinue() {
 				removed := 0

cmd/micro/debug.go

@@ -18,7 +18,7 @@ func (NullWriter) Write(data []byte) (n int, err error) {
 // InitLog sets up the debug log system for micro if it has been enabled by compile-time variables
 func InitLog() {
 	if util.Debug == "ON" {
-		f, err := os.OpenFile("log.txt", os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0666)
+		f, err := os.OpenFile("log.txt", os.O_RDWR|os.O_CREATE|os.O_TRUNC, util.FileMode)
 		if err != nil {
 			log.Fatalf("error opening file: %v", err)
 		}