Merge branch 'st3-develop' into st4-develop

Author: deathaxe

schemes/MarkdownEditor-ArcDark.sublime-color-scheme

@@ -394,6 +394,12 @@
 			"scope": "markup.prompt",
 			"foreground": "#aaaaaa"
 		},
+		{
+			"name": "Markup: Highlight",
+			"scope": "markup.highlight",
+			"foreground": "var(critic_highlight_fg)",
+			"background": "var(critic_highlight_bg)"
+		},
 
 		//
 		// CriticMarkup

schemes/MarkdownEditor-Dark.sublime-color-scheme

@@ -406,6 +406,12 @@
 			"scope": "markup.prompt",
 			"foreground": "#aaaaaa"
 		},
+		{
+			"name": "Markup: Highlight",
+			"scope": "markup.highlight",
+			"foreground": "var(critic_highlight_fg)",
+			"background": "var(critic_highlight_bg)"
+		},
 
 		//
 		// CriticMarkup

schemes/MarkdownEditor-Focus.sublime-color-scheme

@@ -425,6 +425,12 @@
 			"scope": "markup.prompt",
 			"foreground": "#555555"
 		},
+		{
+			"name": "Markup: Highlight",
+			"scope": "markup.highlight",
+			"foreground": "var(critic_highlight_fg)",
+			"background": "var(critic_highlight_bg)"
+		},
 
 		//
 		// CriticMarkup

schemes/MarkdownEditor-Yellow.sublime-color-scheme

@@ -404,6 +404,12 @@
 			"scope": "markup.prompt",
 			"foreground": "#705442"
 		},
+		{
+			"name": "Markup: Highlight",
+			"scope": "markup.highlight",
+			"foreground": "var(critic_highlight_fg)",
+			"background": "var(critic_highlight_bg)"
+		},
 
 		//
 		// CriticMarkup

schemes/MarkdownEditor.sublime-color-scheme

@@ -403,6 +403,12 @@
 			"scope": "markup.prompt",
 			"foreground": "#555555"
 		},
+		{
+			"name": "Markup: Highlight",
+			"scope": "markup.highlight",
+			"foreground": "var(critic_highlight_fg)",
+			"background": "var(critic_highlight_bg)"
+		},
 
 		//
 		// CriticMarkup

syntaxes/Markdown.sublime-syntax

@@ -4016,7 +4016,7 @@ contexts:
     - meta_scope: meta.link.inet.markdown markup.underline.link.markdown-gfm
     # 1. When an autolink ends in ), we scan the entire autolink for the total
     #    number of parentheses. If there is a greater number of closing parentheses
-    #    than opening ones, we don’t consider the last character part of the
+    #    than opening ones, we don't consider the last character part of the
     #    autolink, in order to facilitate including an autolink inside a parenthesis
     # 2. If an autolink ends in a semicolon (;), we check to see if it appears to
     #    resemble an entity reference; if the preceding text is & followed by one