From 6c235fee7d7abc3626686ab49fab8a36055155da Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Sat, 8 Mar 2014 15:54:13 +0400
Subject: [PATCH] release 1.1.3

---
 ChangeLog.txt     | 13 ++++++++++++-
 Readme.md         |  2 +-
 build             |  2 +-
 index.html        |  2 +-
 lib/ace/editor.js |  7 +++----
 5 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 4b48f911..2b1f88bb 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,15 @@
+2014.03.08 Version 1.1.3
+
+* New Features
+  - Allow syntax checkers to be loaded from CDN (Derk-Jan Hartman)
+  - Add ColdFusion behavior (Abram Adams)
+  - add showLineNumbers option
+  - Add html syntax checker (danyaPostfactum)
+ 
+* new language modes
+  - Gherkin (Patrick Nevels)
+  - Smarty
+
 2013.12.02 Version 1.1.2
 
 * New Features
@@ -11,7 +23,6 @@
   - add support for autocompletion and snippets (gjtorikyan danyaPostfactum and others)
   - add option to merge similar changes in undo history
   - add scrollPastEnd option
-  - 6a87d97 Merge pull request #1494 from danyaPostfactum/snippetcompleter
   - use html5 dragndrop for text dragging (danyaPostfactum)
   
 * API Changes
diff --git a/Readme.md b/Readme.md
index ec41ccdc..d621b2a6 100644
--- a/Readme.md
+++ b/Readme.md
@@ -8,7 +8,7 @@ Ace is a standalone code editor written in JavaScript. Our goal is to create a b
 Features
 --------
 
-* Syntax highlighting for over 40 languages (TextMate/Sublime/_.tmlanguage_ files can be imported)
+* Syntax highlighting for over 110 languages (TextMate/Sublime/_.tmlanguage_ files can be imported)
 * Over 20 themes (TextMate/Sublime/_.tmtheme_ files can be imported)
 * Automatic indent and outdent
 * An optional command line
diff --git a/build b/build
index b2f8bf1e..fc9d2cae 160000
--- a/build
+++ b/build
@@ -1 +1 @@
-Subproject commit b2f8bf1e745250596afea5b39c70b94421af906d
+Subproject commit fc9d2cae9fe8e6e95e74c86a31d21caadd8f9f39
diff --git a/index.html b/index.html
index 2249c2f8..8d65f8ea 100644
--- a/index.html
+++ b/index.html
@@ -87,7 +87,7 @@ console.log(addResult);
                             </p>
                             <h2>Features</h2>
                             <ul class="content-list">
-                                <li><a href="http://pcwalton.blogspot.com/2010/11/syntax-highlighting-specification.html">Syntax highlighting</a> for over 60 languages (TextMate/Sublime Text<em>.tmlanguage</em> files can be imported)</li>
+                                <li><a href="http://pcwalton.blogspot.com/2010/11/syntax-highlighting-specification.html">Syntax highlighting</a> for over 110 languages (TextMate/Sublime Text<em>.tmlanguage</em> files can be imported)</li>
                                 <li>Over 20 themes (TextMate/Sublime Text <em>.tmtheme</em> files can be imported)</li>
                                 <li>Automatic indent and outdent</li>
                                 <li>An optional command line</li>
diff --git a/lib/ace/editor.js b/lib/ace/editor.js
index 300e4399..a7765e8c 100644
--- a/lib/ace/editor.js
+++ b/lib/ace/editor.js
@@ -455,11 +455,10 @@ var Editor = function(renderer, session) {
     /**
      * {:VirtualRenderer.setTheme}
      * @param {String} theme The path to a theme
-     *
-     *
+     * @param {Function} cb optional callback called when theme is loaded
      **/
-    this.setTheme = function(theme) {
-        this.renderer.setTheme(theme);
+    this.setTheme = function(theme, cb) {
+        this.renderer.setTheme(theme, cb);
     };
 
     /**