Merge remote-tracking branch 'remotes/origin/master' into mode_live_edit

Conflicts:
	demo/kitchen-sink/demo.js
	lib/ace/mode/coffee_highlight_rules_test.js

tool/Theme.tmpl.css

@@ -1,19 +1,11 @@
 /* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css (UUID: %uuid%) */
 
-.%cssClass% .ace_editor {
-  border: 2px solid rgb(159, 159, 159);
-}
-
-.%cssClass% .ace_editor.ace_focus {
-  border: 2px solid #327fbd;
-}
-
 .%cssClass% .ace_gutter {
   background: #e8e8e8;
   color: #333;
 }
 
-.%cssClass% .ace_print_margin {
+.%cssClass% .ace_print-margin {
   width: 1px;
   background: %printMargin%;
 }
@@ -39,7 +31,7 @@
   background: %selection%;
 }
 
-.%cssClass%.multiselect .ace_selection.start {
+.%cssClass%.ace_multiselect .ace_selection.ace_start {
   box-shadow: 0 0 3px 0px %background%;
   border-radius: 2px;
 }
@@ -53,15 +45,15 @@
   border: 1px solid %bracket%;
 }
 
-.%cssClass% .ace_marker-layer .ace_active_line {
+.%cssClass% .ace_marker-layer .ace_active-line {
   background: %active_line%;
 }
 
-.%cssClass% .ace_gutter_active_line {
+.%cssClass% .ace_gutter-active-line {
   background-color: %active_line%;
 }
 
-.%cssClass% .ace_marker-layer .ace_selected_word {
+.%cssClass% .ace_marker-layer .ace_selected-word {
   %selected_word_highlight%
 }
 

tool/tmlanguage.js

@@ -270,11 +270,13 @@ function convertLanguage(name) {
         var languageHighlightRules = fillTemplate(modeHighlightTemplate, {
               language: languageNameSanitized,
               languageTokens: patterns,
-              respositoryRules: "/*** START REPOSITORY RULES\n" + repository + "\nEND REPOSITORY RULES ***/",
+              respositoryRules: "/*** START REPOSITORY RULES\n" + (Object.keys(repository).length === 0 ?  "" : repository) + "\nEND REPOSITORY RULES ***/",
               uuid: language.uuid
         });
 
         if (devMode) {
+          console.log(languageMode)
+          console.log(languageHighlightRules)
           console.log("Not writing, 'cause we're in dev mode, baby.");
         }
         else {

tool/tmtheme.js

@@ -60,7 +60,7 @@ var supportedScopes = {
    "variable.parameter": "variable.parameter",
 
    "meta": "meta",
-   "meta.tag.sgml.doctype": "xml_pe",
+   "meta.tag.sgml.doctype": "xml-pe",
    "meta.tag": "meta.tag",
    "meta.selector": "meta.selector",
    

tool/update_deps.js

@@ -6,13 +6,15 @@ var https = require("https")
 var rootDir = __dirname + "/../lib/ace/"
 
 var deps = [{
-	path: "worker/jshint.js",
+	path: "mode/javascript/jshint.js",
 	url: "https://raw.github.com/jshint/jshint/master/jshint.js",
-	needsFixup: true
-}, {
-	path: "worker/jslint.js",
-	url: "https://raw.github.com/douglascrockford/JSLint/master/jslint.js",
-	needsFixup: true
+	needsFixup: true,
+	postProcess: function(t) {
+		return t.replace(
+			/"Expected a conditional expression and instead saw an assignment."/g,
+			'"Assignment in conditional expression"'
+		);
+	}
 }, {
 	path: "mode/css/csslint.js",
 	url: "https://raw.github.com/stubbornella/csslint/master/release/csslint-node.js",
@@ -43,7 +45,9 @@ var getDep = function(dep) {
 			data = "define(function(require, exports, module) {\n"
 				+ data
 				+ "\n});"
-				
+		if (dep.postProcess)
+			data = dep.postProcess(data)
+			
 		fs.writeFile(rootDir + dep.path, data, "utf-8", function(err){
 			if (err) throw err
 			console.log("File " + dep.path + " saved.")