Merge branch 'master' into dev

Author: Neko-Box-Coder

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

.gitignore

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

README.md

@@ -4,7 +4,6 @@
 > This is just my personal development branch for [micro](https://github.com/zyedidia/micro) where many of my (and other) PRs are merged
 >
 > ### Merged Open PRs
-> - [Changing syntax behavior for single quote to allow binary and hex literal separator #3310](https://github.com/zyedidia/micro/pull/3310)
 > - [Fix indent selection #3102](https://github.com/zyedidia/micro/pull/3102)
 > - [Add wrapindent option to allow wrapping and hanging indents #3107](https://github.com/zyedidia/micro/pull/3107)
 > - [add next/prev split/tab support for terminal pane #3165](https://github.com/zyedidia/micro/pull/3165)
@@ -15,10 +14,7 @@
 > - [Add the ability lock settings.json and bindings.json for plugins #3618](https://github.com/zyedidia/micro/pull/3618)
 > - [Adding error screen for lua functions running in status line #3691](https://github.com/zyedidia/micro/pull/3691)
 > - [Adding lua function to use result of RunBackgroundShell #3692](https://github.com/zyedidia/micro/pull/3692)
-> - [Adding indenttabchar, indentspacechar and spacechar options #3760](https://github.com/zyedidia/micro/pull/3760)
-> - [Adding missing file closes #3807](https://github.com/zyedidia/micro/pull/3807)
 > - [Pasting multi cursor clipboard with newlines for non matching cursors #3809](https://github.com/zyedidia/micro/pull/3809)
-> - [Adding the ability to differentiate builtin plugins when listing #3810](https://github.com/zyedidia/micro/pull/3810)
 > - [Added support for multi-cursor comments to the comment plugin #3543 (Removed the version part)](https://github.com/zyedidia/micro/pull/3543)
 >
 > To see the diff between this and upstream master, click [here](https://github.com/zyedidia/micro/compare/master...Neko-Box-Coder:micro-dev:dev)
@@ -35,7 +31,7 @@ Just like the official release, you can find the nightly build of this branch un
 > Below is the original readme
 
 ![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)
@@ -176,7 +172,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))
@@ -230,7 +226,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.