From 186e6b1b86923ba7510ef3d079604147c01fe514 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Sat, 8 Jun 2013 18:34:42 +0400
Subject: [PATCH] use `markup.heading` for `#` and `heading` for the
 defaultToken fixes #1457

---
 lib/ace/mode/markdown_highlight_rules.js  | 4 ++--
 lib/ace/theme/chrome.css                  | 4 ++--
 lib/ace/theme/cobalt.css                  | 4 ++--
 lib/ace/theme/dawn.css                    | 4 ++--
 lib/ace/theme/dreamweaver.css             | 4 ++--
 lib/ace/theme/kr_theme.css                | 2 +-
 lib/ace/theme/terminal.css                | 2 +-
 lib/ace/theme/textmate.css                | 4 ++--
 lib/ace/theme/tomorrow.css                | 2 +-
 lib/ace/theme/tomorrow_night.css          | 2 +-
 lib/ace/theme/tomorrow_night_blue.css     | 2 +-
 lib/ace/theme/tomorrow_night_bright.css   | 2 +-
 lib/ace/theme/tomorrow_night_eighties.css | 2 +-
 lib/ace/theme/twilight.css                | 4 ++--
 14 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/lib/ace/mode/markdown_highlight_rules.js b/lib/ace/mode/markdown_highlight_rules.js
index f9591b36..56ee5e60 100644
--- a/lib/ace/mode/markdown_highlight_rules.js
+++ b/lib/ace/mode/markdown_highlight_rules.js
@@ -140,7 +140,7 @@ var MarkdownHighlightRules = function() {
         }, {
             include: "basic"
         }, {
-            defaultToken : "markup.heading"
+            defaultToken : "heading"
         } ],
 
         "listblock-start" : [{
@@ -160,7 +160,7 @@ var MarkdownHighlightRules = function() {
         }, {
             include : "basic", noEscape: true
         }, {
-            defaultToken : "markup.list"
+            defaultToken : "list"
         } ],
 
         "blockquote" : [ { // BLockquotes only escape on blank lines.
diff --git a/lib/ace/theme/chrome.css b/lib/ace/theme/chrome.css
index e2bcb11d..f7e65098 100644
--- a/lib/ace/theme/chrome.css
+++ b/lib/ace/theme/chrome.css
@@ -97,11 +97,11 @@
 }
 
 
-.ace-chrome .ace_markup.ace_heading {
+.ace-chrome .ace_heading {
   color: rgb(12, 7, 255);
 }
 
-.ace-chrome .ace_markup.ace_list {
+.ace-chrome .ace_list {
   color:rgb(185, 6, 144);
 }
 
diff --git a/lib/ace/theme/cobalt.css b/lib/ace/theme/cobalt.css
index 7caccf15..36608202 100644
--- a/lib/ace/theme/cobalt.css
+++ b/lib/ace/theme/cobalt.css
@@ -123,12 +123,12 @@
   color: #9EFFFF
 }
 
-.ace-cobalt .ace_markup.ace_heading {
+.ace-cobalt .ace_heading {
   color: #C8E4FD;
   background-color: #001221
 }
 
-.ace-cobalt .ace_markup.ace_list {
+.ace-cobalt .ace_list {
   background-color: #130D26
 }
 
diff --git a/lib/ace/theme/dawn.css b/lib/ace/theme/dawn.css
index ac3a02f5..3bbf33fe 100644
--- a/lib/ace/theme/dawn.css
+++ b/lib/ace/theme/dawn.css
@@ -94,7 +94,7 @@
   border-color: #080808
 }
 
-.ace-dawn .ace_markup.ace_list,
+.ace-dawn .ace_list,
 .ace-dawn .ace_support.ace_function {
   color: #693A17
 }
@@ -121,7 +121,7 @@
   color: #234A97
 }
 
-.ace-dawn .ace_markup.ace_heading {
+.ace-dawn .ace_heading {
   color: #19356D
 }
 
diff --git a/lib/ace/theme/dreamweaver.css b/lib/ace/theme/dreamweaver.css
index a0b42806..949be9ca 100644
--- a/lib/ace/theme/dreamweaver.css
+++ b/lib/ace/theme/dreamweaver.css
@@ -105,11 +105,11 @@
 }
 
 
-.ace-dreamweaver .ace_markup.ace_heading {
+.ace-dreamweaver .ace_heading {
   color: rgb(12, 7, 255);
 }
 
-.ace-dreamweaver .ace_markup.ace_list {
+.ace-dreamweaver .ace_list {
   color:rgb(185, 6, 144);
 }
 
diff --git a/lib/ace/theme/kr_theme.css b/lib/ace/theme/kr_theme.css
index 54e38a8f..e9e336f5 100644
--- a/lib/ace/theme/kr_theme.css
+++ b/lib/ace/theme/kr_theme.css
@@ -119,7 +119,7 @@
   color: #BABD9C
 }
 
-.ace-kr-theme .ace_markup.ace_list {
+.ace-kr-theme .ace_list {
   background-color: #0F0040
 }
 
diff --git a/lib/ace/theme/terminal.css b/lib/ace/theme/terminal.css
index ee4e5dea..2bafcbc2 100644
--- a/lib/ace/theme/terminal.css
+++ b/lib/ace/theme/terminal.css
@@ -115,7 +115,7 @@
   color: #E7C547
 }
 
-.ace-terminal-theme .ace_markup.ace_heading,
+.ace-terminal-theme .ace_heading,
 .ace-terminal-theme .ace_string {
   color: #B9CA4A
 }
diff --git a/lib/ace/theme/textmate.css b/lib/ace/theme/textmate.css
index eb657170..43b8ed36 100644
--- a/lib/ace/theme/textmate.css
+++ b/lib/ace/theme/textmate.css
@@ -105,11 +105,11 @@
 }
 
 
-.ace-tm .ace_markup.ace_heading {
+.ace-tm .ace_heading {
   color: rgb(12, 7, 255);
 }
 
-.ace-tm .ace_markup.ace_list {
+.ace-tm .ace_list {
   color:rgb(185, 6, 144);
 }
 
diff --git a/lib/ace/theme/tomorrow.css b/lib/ace/theme/tomorrow.css
index 9c39d916..f8f05614 100644
--- a/lib/ace/theme/tomorrow.css
+++ b/lib/ace/theme/tomorrow.css
@@ -108,7 +108,7 @@
   color: #C99E00
 }
 
-.ace-tomorrow .ace_markup.ace_heading,
+.ace-tomorrow .ace_heading,
 .ace-tomorrow .ace_string {
   color: #718C00
 }
diff --git a/lib/ace/theme/tomorrow_night.css b/lib/ace/theme/tomorrow_night.css
index cd61a463..1118799a 100644
--- a/lib/ace/theme/tomorrow_night.css
+++ b/lib/ace/theme/tomorrow_night.css
@@ -107,7 +107,7 @@
   color: #F0C674
 }
 
-.ace-tomorrow-night .ace_markup.ace_heading,
+.ace-tomorrow-night .ace_heading,
 .ace-tomorrow-night .ace_string {
   color: #B5BD68
 }
diff --git a/lib/ace/theme/tomorrow_night_blue.css b/lib/ace/theme/tomorrow_night_blue.css
index c2d9a616..51dfe2bf 100644
--- a/lib/ace/theme/tomorrow_night_blue.css
+++ b/lib/ace/theme/tomorrow_night_blue.css
@@ -107,7 +107,7 @@
   color: #FFEEAD
 }
 
-.ace-tomorrow-night-blue .ace_markup.ace_heading,
+.ace-tomorrow-night-blue .ace_heading,
 .ace-tomorrow-night-blue .ace_string {
   color: #D1F1A9
 }
diff --git a/lib/ace/theme/tomorrow_night_bright.css b/lib/ace/theme/tomorrow_night_bright.css
index 656f9736..065d9783 100644
--- a/lib/ace/theme/tomorrow_night_bright.css
+++ b/lib/ace/theme/tomorrow_night_bright.css
@@ -107,7 +107,7 @@
   color: #E7C547
 }
 
-.ace-tomorrow-night-bright .ace_markup.ace_heading,
+.ace-tomorrow-night-bright .ace_heading,
 .ace-tomorrow-night-bright .ace_string {
   color: #B9CA4A
 }
diff --git a/lib/ace/theme/tomorrow_night_eighties.css b/lib/ace/theme/tomorrow_night_eighties.css
index 74ef8370..613fd9a0 100644
--- a/lib/ace/theme/tomorrow_night_eighties.css
+++ b/lib/ace/theme/tomorrow_night_eighties.css
@@ -107,7 +107,7 @@
   color: #FFCC66
 }
 
-.ace-tomorrow-night-eighties .ace_markup.ace_heading,
+.ace-tomorrow-night-eighties .ace_heading,
 .ace-tomorrow-night-eighties .ace_string {
   color: #99CC99
 }
diff --git a/lib/ace/theme/twilight.css b/lib/ace/theme/twilight.css
index 9ca52358..3f9d40e6 100644
--- a/lib/ace/theme/twilight.css
+++ b/lib/ace/theme/twilight.css
@@ -65,7 +65,7 @@
 .ace-twilight .ace_constant.ace_character,
 .ace-twilight .ace_constant.ace_character.ace_escape,
 .ace-twilight .ace_constant.ace_other,
-.ace-twilight .ace_markup.ace_heading,
+.ace-twilight .ace_heading,
 .ace-twilight .ace_support.ace_constant {
   color: #CF6A4C
 }
@@ -94,7 +94,7 @@
   color: #DAD085
 }
 
-.ace-twilight .ace_markup.ace_list,
+.ace-twilight .ace_list,
 .ace-twilight .ace_storage {
   color: #F9EE98
 }