Merge branch 'master' into fix/file-detection

runtime/help/colors.md

@@ -194,6 +194,7 @@ Here is a list of the colorscheme groups that you can use:
 * divider (Color of the divider between vertical splits)
 * message (Color of messages in the bottom line of the screen)
 * error-message (Color of error messages in the bottom line of the screen)
+* match-brace (Color of matching brackets when `matchbracestyle` is set to `highlight`)
 
 Colorschemes must be placed in the `~/.config/micro/colorschemes` directory to
 be used.

runtime/help/commands.md

@@ -31,9 +31,11 @@ quotes here but these are not necessary when entering the command in micro.
 
 * `quit`: quits micro.
 
-* `goto 'line'`: jumps to the given line number. A negative number can be
-   passed to jump inward from the end of the file; for example, -5 jumps
-   to the 5th-last line in the file.
+* `goto 'line[:col]'`: Jumps to the given line (and optional column) number.
+   `line` can be prefixed with `+`, `-` or `~`.
+   +/- will perform relative jumps from the current position of the cursor
+   (e.g. +5 will jump 5 lines down), while ~ will perform a jump inward
+   from the end of the file (e.g. ~5 jumps to the 5th-last line in the file).
 
 * `replace 'search' 'value' 'flags'?`: This will replace `search` with `value`. 
    The `flags` are optional. Possible flags are:

runtime/help/keybindings.md

@@ -409,8 +409,14 @@ mouse actions)
 
 ```
 MouseLeft
+MouseLeftDrag
+MouseLeftRelease
 MouseMiddle
+MouseMiddleDrag
+MouseMiddleRelease
 MouseRight
+MouseRightDrag
+MouseRightRelease
 MouseWheelUp
 MouseWheelDown
 MouseWheelLeft
@@ -524,11 +530,13 @@ conventions for text editing defaults.
     "Esc": "Escape",
 
     // Mouse bindings
-    "MouseWheelUp":   "ScrollUp",
-    "MouseWheelDown": "ScrollDown",
-    "MouseLeft":      "MousePress",
-    "MouseMiddle":    "PastePrimary",
-    "Ctrl-MouseLeft": "MouseMultiCursor",
+    "MouseWheelUp":     "ScrollUp",
+    "MouseWheelDown":   "ScrollDown",
+    "MouseLeft":        "MousePress",
+    "MouseLeftDrag":    "MouseDrag",
+    "MouseLeftRelease": "MouseRelease",
+    "MouseMiddle":      "PastePrimary",
+    "Ctrl-MouseLeft":   "MouseMultiCursor",
 
     // Multi-cursor bindings
     "Alt-n":        "SpawnMultiCursor",
@@ -634,10 +642,12 @@ are given below:
         "Esc": "AbortCommand",
 
         // Mouse bindings
-        "MouseWheelUp":   "HistoryUp",
-        "MouseWheelDown": "HistoryDown",
-        "MouseLeft":      "MousePress",
-        "MouseMiddle":    "PastePrimary"
+        "MouseWheelUp":     "HistoryUp",
+        "MouseWheelDown":   "HistoryDown",
+        "MouseLeft":        "MousePress",
+        "MouseLeftDrag":    "MouseDrag",
+        "MouseLeftRelease": "MouseRelease",
+        "MouseMiddle":      "PastePrimary"
     }
 }
 ```

runtime/help/options.md

@@ -164,7 +164,7 @@ Here are the available options:
    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`
+	default value: `unix` on Unix systems, `dos` on Windows
 
 * `filetype`: sets the filetype for the current buffer. Set this option to
   `off` to completely disable filetype detection.
@@ -181,6 +181,19 @@ Here are the available options:
 
 	default value: `false`
 
+* `hltaberrors`: highlight tabs when spaces are expected, and spaces when tabs
+   are expected. More precisely: if `tabstospaces` option is on, highlight
+   all tab characters; if `tabstospaces` is off, highlight space characters
+   in the initial indent part of the line.
+
+	default value: `false`
+
+* `hltrailingws`: highlight trailing whitespaces at ends of lines. Note that
+   it doesn't highlight newly added trailing whitespaces that naturally occur
+   while typing text. It highlights only nasty forgotten trailing whitespaces.
+
+	default value: `false`
+
 * `incsearch`: enable incremental search in "Find" prompt (matching as you type).
 
 	default value: `true`
@@ -217,11 +230,19 @@ Here are the available options:
 
 	default value: `false`
 
-* `matchbrace`: underline matching braces for '()', '{}', '[]' when the cursor
-   is on a brace character.
+* `matchbrace`: show matching braces for '()', '{}', '[]' when the cursor
+   is on a brace character or next to it.
 
     default value: `true`
 
+* `matchbracestyle`: whether to underline or highlight matching braces when
+  `matchbrace` is enabled. The color of highlight is determined by the `match-brace`
+  field in the current theme. Possible values:
+  * `underline`: underline matching braces.
+  * `highlight`: use `match-brace` style from the current theme.
+
+   default value: `underline`
+
 * `mkparents`: if a file is opened on a path that does not exist, the file
    cannot be saved because the parent directories don't exist. This option lets
    micro automatically create the parent directories in such a situation.
@@ -502,6 +523,7 @@ so that you can see what the formatting should look like.
     "linter": true,
     "literate": true,
     "matchbrace": true,
+    "matchbracestyle": "underline",
     "mkparents": false,
     "mouse": true,
     "parsecursor": false,

runtime/help/plugins.md

@@ -67,9 +67,9 @@ which micro defines:
    by the user. Returns a boolean which defines whether the action should
    be canceled.
 
-* `onRune(rune)`: runs when the composed rune has been inserted
+* `onRune(bufpane, rune)`: runs when the composed rune has been inserted
 
-* `preRune(rune)`: runs before the composed rune will be inserted
+* `preRune(bufpane, rune)`: runs before the composed rune will be inserted
 
 For example a function which is run every time the user saves the buffer
 would be:
@@ -367,6 +367,7 @@ strings
 regexp
 errors
 time
+unicode/utf8
 archive/zip
 net/http
 ```