Merge branch 'master' into view-refactor

runtime/syntax/README.md

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # Syntax Files
 
 Here are micro's syntax files.
@@ -25,3 +26,45 @@ Most the the syntax files here have been converted using that tool.
 
 Note that the tool isn't perfect and though it is unlikely, you may run into some small issues that you will have to fix manually
 (about 4 files from this directory had issues after being converted).
+=======
+# Micro syntax highlighting files
+
+These are the syntax highlighting files for micro. To install them, just
+put all the syntax files in `~/.config/micro/syntax`.
+
+They are taken from Nano, specifically from [this repository](https://github.com/scopatz/nanorc).
+Micro syntax files are almost identical to Nano's, except for some key differences:
+
+* Micro does not use `icolor`. Instead, for a case insensitive match, use the case insensitive flag (`i`) in the regular expression
+    * For example, `icolor green ".*"` would become `color green "(?i).*"`
+
+# Using with colorschemes
+
+Not all of these files have been converted to use micro's colorscheme feature. Most of them just hardcode the colors, which can be problematic depending on the colorscheme you use.
+
+Here is a list of the files that have been converted to properly use colorschemes:
+
+* vi
+* go
+* c
+* d
+* markdown
+* html
+* lua
+* swift
+* rust
+* java
+* javascript
+* pascal
+* python
+* ruby
+* sh
+* git
+* tex
+* solidity
+
+# License
+
+Because the nano syntax files I have modified are distributed under the GNU GPLv3 license, these files are also distributed
+under that license. See [LICENSE](LICENSE).
+>>>>>>> master