From c2fb30b313cbd3e2d31e90bb686de4faa7344d59 Mon Sep 17 00:00:00 2001
From: Benoit Schweblin <benoit.schweblin@gmail.com>
Date: Tue, 19 Nov 2013 19:48:13 +0000
Subject: [PATCH 1/4] [Markdown highlighting] Parse basic rules in blockquotes

---
 lib/ace/mode/markdown_highlight_rules.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/ace/mode/markdown_highlight_rules.js b/lib/ace/mode/markdown_highlight_rules.js
index 5533fdbd..e559212f 100644
--- a/lib/ace/mode/markdown_highlight_rules.js
+++ b/lib/ace/mode/markdown_highlight_rules.js
@@ -83,7 +83,7 @@ var MarkdownHighlightRules = function() {
         next  : "githubblock"
     }, { // block quote
         token : "string.blockquote",
-        regex : "^>[ ].+$",
+        regex : "^\\s*>[ ]",
         next  : "blockquote"
     }, { // HR * - _
         token : "constant",
@@ -173,8 +173,9 @@ var MarkdownHighlightRules = function() {
             regex : "^\\s*$",
             next  : "start"
         }, {
-            token : "string",
-            regex : ".+"
+            include : "basic", noEscape: true
+        }, {
+            defaultToken : "blockquote"
         } ],
 
         "githubblock" : [ {

From a50c0a27b90723849268c675a90ca842f7b70fe3 Mon Sep 17 00:00:00 2001
From: Benoit Schweblin <benoit.schweblin@gmail.com>
Date: Wed, 20 Nov 2013 00:15:28 +0000
Subject: [PATCH 2/4] [Markdown highlighting] Fixed list inside blockquotes

---
 lib/ace/mode/markdown_highlight_rules.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/ace/mode/markdown_highlight_rules.js b/lib/ace/mode/markdown_highlight_rules.js
index e559212f..5b20796b 100644
--- a/lib/ace/mode/markdown_highlight_rules.js
+++ b/lib/ace/mode/markdown_highlight_rules.js
@@ -83,7 +83,7 @@ var MarkdownHighlightRules = function() {
         next  : "githubblock"
     }, { // block quote
         token : "string.blockquote",
-        regex : "^\\s*>[ ]",
+        regex : "^\\s*>\\s*(?:[*+-]|\\d+\\.)?\\s+",
         next  : "blockquote"
     }, { // HR * - _
         token : "constant",
@@ -172,6 +172,10 @@ var MarkdownHighlightRules = function() {
             token : "empty_line",
             regex : "^\\s*$",
             next  : "start"
+        }, { // block quote
+            token : "string.blockquote",
+            regex : "^\\s*>\\s*(?:[*+-]|\\d+\\.)?\\s+",
+            next  : "blockquote"
         }, {
             include : "basic", noEscape: true
         }, {

From 78ee0833ba78bd978c784ed838f4be38e02ecdc0 Mon Sep 17 00:00:00 2001
From: Benoit Schweblin <benoit.schweblin@gmail.com>
Date: Sat, 23 Nov 2013 22:53:11 +0000
Subject: [PATCH 3/4] Set defaultToken to markup.list for lists and
 string.blockquote for blockquotes

---
 lib/ace/mode/markdown_highlight_rules.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/ace/mode/markdown_highlight_rules.js b/lib/ace/mode/markdown_highlight_rules.js
index 5b20796b..7d83a39e 100644
--- a/lib/ace/mode/markdown_highlight_rules.js
+++ b/lib/ace/mode/markdown_highlight_rules.js
@@ -165,7 +165,7 @@ var MarkdownHighlightRules = function() {
         }, {
             include : "basic", noEscape: true
         }, {
-            defaultToken : "list"
+            defaultToken : "markup.list"
         } ],
 
         "blockquote" : [ { // BLockquotes only escape on blank lines.
@@ -179,7 +179,7 @@ var MarkdownHighlightRules = function() {
         }, {
             include : "basic", noEscape: true
         }, {
-            defaultToken : "blockquote"
+            defaultToken : "string.blockquote"
         } ],
 
         "githubblock" : [ {

From d870d81ea07b2de52ad6ea7474066fef9602b597 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Sun, 24 Nov 2013 16:31:07 +0400
Subject: [PATCH 4/4] revert change to markup.list

---
 lib/ace/mode/markdown_highlight_rules.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ace/mode/markdown_highlight_rules.js b/lib/ace/mode/markdown_highlight_rules.js
index 7d83a39e..e5146ae0 100644
--- a/lib/ace/mode/markdown_highlight_rules.js
+++ b/lib/ace/mode/markdown_highlight_rules.js
@@ -165,7 +165,7 @@ var MarkdownHighlightRules = function() {
         }, {
             include : "basic", noEscape: true
         }, {
-            defaultToken : "markup.list"
+            defaultToken : "list" //do not use markup.list to allow stling leading `*` differntly
         } ],
 
         "blockquote" : [ { // BLockquotes only escape on blank lines.