229 changed files with 5756 additions and 24767 deletions
--- a/.gitignore
+++ b/.gitignore
@ -2,7 +2,6 @@
 .DS_Store
 *.swp
 *.tmp
-*~

 # Project files that should not be in the repo
 .*
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -7,9 +7,16 @@ Feel free to fork and improve/enhance Ace any way you want. If you feel that the

 There are two versions of the agreement:

-1. [The Individual CLA](https://docs.google.com/a/c9.io/forms/d/1MfmfrxqD_PNlNsuK0lC2KSelRLxGLGfh_wEcG0ijVvo/viewform): use this version if you're working on the Cloud9 SDK or open source projects in your spare time, or can clearly claim ownership of copyright in what you'll be submitting.
-2. [The Corporate CLA](https://docs.google.com/a/c9.io/forms/d/1vFejn4111GdnCNuQ6BfnJDaxdsUEMD4KCo1ayovAfu0/viewform): have your corporate lawyer review and submit this if your company is going to be contributing to the Cloud9 SDK and/or open source projects.
+1. [The Individual CLA](https://github.com/ajaxorg/ace/raw/master/doc/Contributor_License_Agreement-v2.pdf): use this version if you're working on an ajax.org in your spare time, or can clearly claim ownership of copyright in what you'll be submitting.
+2. [The Corporate CLA](https://github.com/ajaxorg/ace/raw/master/doc/Corporate_Contributor_License_Agreement-v2.pdf): have your corporate lawyer review and submit this if your company is going to be contributing to ajax.org  projects

-If you want to contribute to the Cloud9 SDK and/or open source projects please go to the online form, fill it out and submit it.
+If you want to contribute to an ajax.org project please print the CLA and fill it out and sign it. Then either send it by snail mail or fax to us or send it back scanned (or as a photo) by email.

-Happy coding, Cloud9
+Email: ace+cla@c9.io
+
+Fax: +31 (0) 206388953
+
+Address: Ajax.org B.V.
+  Keizersgracht 241
+  1016 EA, Amsterdam
+  the Netherlands
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@ -1,17 +1,4 @@
-Version 1.2.0-pre

-* New Features
-  - Indented soft wrap (danyaPostfactum)
-
-* API Changes
-  - unified delta types `{start, end, action, lines}`  (Alden Daniels https://github.com/ajaxorg/ace/pull/1745)
-  - "change" event listeners on session and editor get delta objects directly
-
-2015.04.03 Version 1.1.9
-
-  - Small Enhancements and Bugfixes
-
-2014.11.08 Version 1.1.8

 * API Changes
  - `editor.commands.commandKeyBinding` now contains direct map from keys to commands instead of grouping them by hashid
--- a/Makefile.dryice.js
+++ b/Makefile.dryice.js
@ -120,7 +120,6 @@ function demo() {

    function changeComments(data) {
        return (data
-            .replace("doc/site/images/ace-logo.png", "demo/kitchen-sink/ace-logo.png")
            .replace(/<!\-\-DEVEL[\d\D]*?DEVEL\-\->/g, "")
            .replace(/PACKAGE\-\->|<!\-\-PACKAGE/g, "")
            .replace(/\/\*DEVEL[\d\D]*?DEVEL\*\//g, "")
@ -307,7 +306,6 @@ function buildAceModuleInternal(opts, callback) {
        ignore: opts.ignore || [],
        withRequire: false,
        basepath: ACE_HOME,
-        transforms: [normalizeLineEndings],
        afterRead: [optimizeTextModules]
    }, write);
 }
@ -408,10 +406,6 @@ function getLoadedFileList(options, callback, result) {
    callback(Object.keys(deps));
 }

-function normalizeLineEndings(module) {
-    module.source = module.source.replace(/\r\n/g, "\n");
-}
-
 function optimizeTextModules(sources) {
    var textModules = {};
    return sources.filter(function(pkg) {
@ -457,10 +451,10 @@ function optimizeTextModules(sources) {
        if (/\.css$/.test(pkg.id)) {
            // remove unnecessary whitespace from css
            input = input.replace(/\n\s+/g, "\n");
-            input = '"' + input.replace(/\n/g, '\\\n') + '"';
+            input = '"' + input.replace(/\r?\n/g, '\\\n') + '"';
        } else {
            // but don't break other files!
-            input = '"' + input.replace(/\n/g, '\\n\\\n') + '"';
+            input = '"' + input.replace(/\r?\n/g, '\\n\\\n') + '"';
        }
        textModules[pkg.id] = input;
    }
--- a/Readme.md
+++ b/Readme.md
@ -79,7 +79,7 @@ By default the editor only supports plain text mode; many other languages are av
 The mode can then be used like this:

 ```javascript
-    var JavaScriptMode = ace.require("ace/mode/javascript").Mode;
+    var JavaScriptMode = require("ace/mode/javascript").Mode;
    editor.getSession().setMode(new JavaScriptMode());
 ```

--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit a4e495d8901876c6bafe3870a35cb8e32c827e97
+Subproject commit 17c02716b7f116c7920f8ef07c8c2b0e20d77ec0
--- a/build_support/mini_require.js
+++ b/build_support/mini_require.js
@ -38,62 +38,69 @@

 var ACE_NAMESPACE = "";

-var global = (function() { return this; })();
-if (!global && typeof window != "undefined") global = window; // strict mode
+var global = (function() {
+    return this;
+})();


 if (!ACE_NAMESPACE && typeof requirejs !== "undefined")
    return;


-var define = function(module, deps, payload) {
-    if (typeof module !== "string") {
-        if (define.original)
-            define.original.apply(this, arguments);
+var _define = function(module, deps, payload) {
+    if (typeof module !== 'string') {
+        if (_define.original)
+            _define.original.apply(window, arguments);
        else {
-            console.error("dropping module because define wasn\'t a string.");
+            console.error('dropping module because define wasn\'t a string.');
            console.trace();
        }
        return;
    }
+
    if (arguments.length == 2)
        payload = deps;
-    if (!define.modules[module]) {
-        define.payloads[module] = payload;
-        define.modules[module] = null;
-    }
-};

-define.modules = {};
-define.payloads = {};
+    if (!_define.modules) {
+        _define.modules = {};
+        _define.payloads = {};
+    }
+
+    _define.payloads[module] = payload;
+    _define.modules[module] = null;
+};

 /**
 * Get at functionality define()ed using the function above
 */
 var _require = function(parentId, module, callback) {
-    if (typeof module === "string") {
-        var payload = lookup(parentId, module);
-        if (payload != undefined) {
-            callback && callback();
-            return payload;
-        }
-    } else if (Object.prototype.toString.call(module) === "[object Array]") {
+    if (Object.prototype.toString.call(module) === "[object Array]") {
        var params = [];
        for (var i = 0, l = module.length; i < l; ++i) {
            var dep = lookup(parentId, module[i]);
-            if (dep == undefined && require.original)
-                return;
+            if (!dep && _require.original)
+                return _require.original.apply(window, arguments);
            params.push(dep);
        }
-        return callback && callback.apply(null, params) || true;
+        if (callback) {
+            callback.apply(null, params);
+        }
    }
-};
+    else if (typeof module === 'string') {
+        var payload = lookup(parentId, module);
+        if (!payload && _require.original)
+            return _require.original.apply(window, arguments);

-var require = function(module, callback) {
-    var packagedModule = _require("", module, callback);
-    if (packagedModule == undefined && require.original)
-        return require.original.apply(this, arguments);
-    return packagedModule;
+        if (callback) {
+            callback();
+        }
+
+        return payload;
+    }
+    else {
+        if (_require.original)
+            return _require.original.apply(window, arguments);
+    }
 };

 var normalizeModule = function(parentId, moduleName) {
@ -112,6 +119,7 @@ var normalizeModule = function(parentId, moduleName) {
            moduleName = moduleName.replace(/\/\.\//, "/").replace(/[^\/]+\/\.\.\//, "");
        }
    }
+
    return moduleName;
 };

@ -120,11 +128,12 @@ var normalizeModule = function(parentId, moduleName) {
 * definition function if needed.
 */
 var lookup = function(parentId, moduleName) {
+
    moduleName = normalizeModule(parentId, moduleName);

-    var module = define.modules[moduleName];
+    var module = _define.modules[moduleName];
    if (!module) {
-        module = define.payloads[moduleName];
+        module = _define.payloads[moduleName];
        if (typeof module === 'function') {
            var exports = {};
            var mod = {
@ -140,15 +149,19 @@ var lookup = function(parentId, moduleName) {

            var returnValue = module(req, exports, mod);
            exports = returnValue || mod.exports;
-            define.modules[moduleName] = exports;
-            delete define.payloads[moduleName];
+            _define.modules[moduleName] = exports;
+            delete _define.payloads[moduleName];
        }
-        module = define.modules[moduleName] = exports || module;
+        module = _define.modules[moduleName] = exports || module;
    }
    return module;
 };

 function exportAce(ns) {
+    var require = function(module, callback) {
+        return _require("", module, callback);
+    };
+
    var root = global;
    if (ns) {
        if (!global[ns])
@ -157,13 +170,13 @@ function exportAce(ns) {
    }

    if (!root.define || !root.define.packaged) {
-        define.original = root.define;
-        root.define = define;
+        _define.original = root.define;
+        root.define = _define;
        root.define.packaged = true;
    }

    if (!root.require || !root.require.packaged) {
-        require.original = root.require;
+        _require.original = root.require;
        root.require = require;
        root.require.packaged = true;
    }
--- a/demo/autoresize.html
+++ b/demo/autoresize.html
@ -7,13 +7,14 @@
  <style type="text/css" media="screen">

 	.ace_editor {
+		position: relative !important;
 		border: 1px solid lightgray;
 		margin: auto;
 		height: 200px;
 		width: 80%;
 	}
 	.scrollmargin {
-		height: 80px;
+		height: 100px;
        text-align: center;
 	}
    </style>
@ -23,8 +24,6 @@
 <div class="scrollmargin"></div>
 <pre id="editor2">minHeight = 2 lines</pre>
 <div class="scrollmargin"></div>
-<pre id="editor3" style="width: 40%;"></pre>
-<div class="scrollmargin"></div>
 <pre id="editor"></pre>

 <script src="kitchen-sink/require.js"></script>
@ -47,13 +46,6 @@ require(["ace/ace"], function(ace) {
    editor2.setOption("maxLines", 30);
    editor2.setOption("minLines", 2);

-    var editor = ace.edit("editor3");
-    editor.setOptions({
-        autoScrollEditorIntoView: true,
-        maxLines: 8
-    });
-    editor.renderer.setScrollMargin(10, 10, 10, 10);
-    
    var editor = ace.edit("editor");
    editor.setTheme("ace/theme/tomorrow");
    editor.session.setMode("ace/mode/html");
--- a/demo/emmet.html
+++ b/demo/emmet.html
@ -23,7 +23,7 @@
 <pre id="editor"></pre>

 <!-- load emmet code and snippets compiled for browser -->
-<script src="https://cloud9ide.github.io/emmet-core/emmet.js"></script>
+<script src="https://nightwing.github.io/emmet-core/emmet.js"></script>

 <script src="kitchen-sink/require.js"></script>
 <script>
--- a/demo/kitchen-sink/demo.js
+++ b/demo/kitchen-sink/demo.js
@ -531,7 +531,7 @@ new StatusBar(env.editor, cmdLine.container);


 var Emmet = require("ace/ext/emmet");
-net.loadScript("https://cloud9ide.github.io/emmet-core/emmet.js", function() {
+net.loadScript("https://nightwing.github.io/emmet-core/emmet.js", function() {
    Emmet.setCore(window.emmet);
    env.editor.setOption("enableEmmet", true);
 });
--- a/demo/kitchen-sink/dev_util.js
+++ b/demo/kitchen-sink/dev_util.js
@ -29,17 +29,13 @@
 * ***** END LICENSE BLOCK ***** */

 define(function(require, exports, module) {
-var dom = require("ace/lib/dom");
-var Range = require("ace/range").Range;
+// allow easy access to ace in console, but not in ace code which uses strict
+function isStrict() {
+    try { return !arguments.callee.caller.caller.caller}
+    catch(e){ return true }
+}
 function warn() {
-    var s = (new Error()).stack || "";
-    s = s.split("\n");
-    if (s[1] == "Error") s.shift(); // remove error description on chrome
-    s.shift(); // remove warn
-    s.shift(); // remove the getter
-    s = s.join("\n");
-    // allow easy access to ace in console, but not in ace code
-    if (!/at Object.InjectedScript.|@debugger eval|snippets:\/{3}|\(<anonymous>:\d+:\d+\)/.test(s)) {
+    if (isStrict()) {
        console.error("trying to access to global variable");
    }
 }
@ -63,155 +59,21 @@ def(window, "session", function(){ warn(); return window.env.editor.session });
 def(window, "split", function(){ warn(); return window.env.split });


-def(window, "devUtil", function(){ warn(); return exports });
-exports.showTextArea = function(argument) {
-    dom.importCssString("\
-      .ace_text-input {\
-        position: absolute;\
-        z-index: 10!important;\
-        width: 6em!important;\
-        height: 1em;\
-        opacity: 1!important;\
-        background: rgba(0, 92, 255, 0.11);\
-        border: none;\
-        font: inherit;\
-        padding: 0 1px;\
-        margin: 0 -1px;\
-        text-indent: 0em;\
-    }\
-    ");
-};
-
-exports.addGlobals = function() {
-    window.oop = require("ace/lib/oop");
-    window.dom = require("ace/lib/dom");
-    window.Range = require("ace/range").Range;
-    window.Editor = require("ace/editor").Editor;
-    window.assert = require("ace/test/asyncjs/assert");
-    window.asyncjs = require("ace/test/asyncjs/async");
-    window.UndoManager = require("ace/undomanager").UndoManager;
-    window.EditSession = require("ace/edit_session").EditSession;
-    window.MockRenderer = require("ace/test/mockrenderer").MockRenderer;
-    window.EventEmitter = require("ace/lib/event_emitter").EventEmitter;
-    
-    window.getSelection = getSelection;
-    window.setSelection = setSelection;
-    window.testSelection = testSelection;
-};
-
-function getSelection(editor) {
-    var data = editor.multiSelect.toJSON();
-    if (!data.length) data = [data];
-    data = data.map(function(x) {
-        var a, c;
-        if (x.isBackwards) {
-            a = x.end;
-            c = x.start;
-        } else {
-            c = x.end;
-            a = x.start;
-        }
-        return Range.comparePoints(a, c) 
-            ? [a.row, a.column, c.row, c.column]
-            : [a.row, a.column];
-    });
-    return data.length > 1 ? data : data[0];
-}
-function setSelection(editor, data) {
-    if (typeof data[0] == "number")
-        data = [data];
-    editor.selection.fromJSON(data.map(function(x) {
-        var start = {row: x[0], column: x[1]};
-        var end = x.length == 2 ? start : {row: x[2], column: x[3]};
-        var isBackwards = Range.comparePoints(start, end) > 0;
-        return isBackwards ? {
-            start: end,
-            end: start,
-            isBackwards: true
-        } : {
-            start: start,
-            end: end,
-            isBackwards: true
-        };
-    }));
-}
-function testSelection(editor, data) {
-    assert.equal(getSelection(editor) + "", data + "");
-}
-
-exports.recordTestCase = function() {
-    exports.addGlobals();
-    var editor = window.editor;
-    var testcase = window.testcase = [];
-    var assert;
-
-    testcase.push({
-        type: "setValue",
-        data: editor.getValue()
-    }, {
-        type: "setSelection",
-        data: getSelection(editor)
-    });
-    editor.commands.on("afterExec", function(e) {
-        testcase.push({
-            type: "exec",
-            data: e
-        });
-        testcase.push({
-            type: "value",
-            data: editor.getValue()
-        });
-        testcase.push({
-            type: "selection",
-            data: getSelection(editor)
-        });
-    });
-    editor.on("mouseup", function() {
-        testcase.push({
-            type: "setSelection",
-            data: getSelection(editor)
-        });
-    });
-    
-    testcase.toString = function() {
-        var lastValue = "";
-        // var lastSelection = ""
-        var str = this.map(function(x) {
-            var data = x.data;
-            switch (x.type) {
-                case "exec": 
-                    return 'editor.execCommand("' 
-                        + data.command.name
-                        + (data.args ? '", ' + JSON.stringify(data.args) : '"')
-                    + ')';
-                case "setSelection":
-                    return 'setSelection(editor, ' + JSON.stringify(data)  + ')';
-                case "setValue":
-                    if (lastValue != data) {
-                        lastValue = data;
-                        return 'editor.setValue(' + JSON.stringify(data) + ', -1)';
-                    }
-                    return;
-                case "selection":
-                    return 'testSelection(editor, ' + JSON.stringify(data) + ')';
-                case "value":
-                    if (lastValue != data) {
-                        lastValue = data;
-                        return 'assert.equal('
-                            + 'editor.getValue(),'
-                            + JSON.stringify(data)
-                        + ')';
-                    }
-                    return;
-            }
-        }).filter(Boolean).join("\n");
-        
-        return getSelection + "\n"
-            + testSelection + "\n"
-            + setSelection + "\n"
-            + "\n" + str + "\n";
-    };
-};
-
+/* for textinput debuggging
+dom.importCssString("\
+  .ace_text-input {\
+    position: absolute;\
+    z-index: 10!important;\
+    width: 6em!important;\
+    height: 1em;\
+    opacity: 1!important;\
+    background: rgba(0, 92, 255, 0.11);\
+    border: none;\
+    font: inherit;\
+    padding: 0 1px;\
+    margin: 0 -1px;\
+    text-indent: 0em;\
+}\
+")*/

 });
--- a/demo/kitchen-sink/doclist.js
+++ b/demo/kitchen-sink/doclist.js
@ -86,12 +86,9 @@ var ownSource = {
    /* filled from require*/
 };

-var hugeDocs = require.toUrl ? {
+var hugeDocs = {
    "build/src/ace.js": "",
    "build/src-min/ace.js": ""
-} : {
-    "src/ace.js": "",
-    "src-min/ace.js": ""
 };

 modelist.modes.forEach(function(m) {
@ -169,44 +166,13 @@ function loadDoc(name, callback) {
    });
 }

-function saveDoc(name, callback) {
-    var doc = fileCache[name] || name;
-    if (!doc || !doc.session)
-        return callback("Unknown document: " + name);
-
-    var path = doc.path;
-    var parts = path.split("/");
-    if (parts[0] == "docs")
-        path = "demo/kitchen-sink/" + path;
-    else if (parts[0] == "ace")
-        path = "lib/" + path;
-
-    upload(path, doc.session.getValue(), callback);
-}
-
-function upload(url, data, callback) {
-    url = net.qualifyURL(url);
-    if (!/https?:/.test(url))
-        return callback(new Error("Unsupported url scheme"));
-    var xhr = new XMLHttpRequest();
-    xhr.open("PUT", url, true);
-    xhr.onreadystatechange = function () {
-        if (xhr.readyState === 4) {
-            callback(!/^2../.test(xhr.status));
-        }
-    };
-    xhr.send(data);
-};
-
-
 module.exports = {
    fileCache: fileCache,
    docs: sort(prepareDocList(docs)),
    ownSource: prepareDocList(ownSource),
    hugeDocs: prepareDocList(hugeDocs),
    initDoc: initDoc,
-    loadDoc: loadDoc,
-    saveDoc: saveDoc,
+    loadDoc: loadDoc
 };
 module.exports.all = {
    "Mode Examples": module.exports.docs,
--- a/demo/kitchen-sink/docs/abc.abc
+++ b/demo/kitchen-sink/docs/abc.abc
@ -1,171 +0,0 @@
-%abc-2.1
-H:This file contains some example English tunes
-% note that the comments (like this one) are to highlight usages
-%  and would not normally be included in such detail
-O:England             % the origin of all tunes is England
-
-X:1                   % tune no 1
-T:Dusty Miller, The   % title
-T:Binny's Jig         % an alternative title
-C:Trad.               % traditional
-R:DH                  % double hornpipe
-M:3/4                 % meter
-K:G                   % key
-B>cd BAG|FA Ac BA|B>cd BAG|DG GB AG:|
-Bdd gfg|aA Ac BA|Bdd gfa|gG GB AG:|
-BG G/2G/2G BG|FA Ac BA|BG G/2G/2G BG|DG GB AG:|
-W:Hey, the dusty miller, and his dusty coat;
-W:He will win a shilling, or he spend a groat.
-W:Dusty was the coat, dusty was the colour;
-W:Dusty was the kiss, that I got frae the miller.
-
-X:2
-T:Old Sir Simon the King
-C:Trad.
-S:Offord MSS          % from Offord manuscript
-N:see also Playford   % reference note
-M:9/8
-R:SJ                  % slip jig
-N:originally in C     % transcription note
-K:G
-D|GFG GAG G2D|GFG GAG F2D|EFE EFE EFG|A2G F2E D2:|
-D|GAG GAB d2D|GAG GAB c2D|[1 EFE EFE EFG|[A2G] F2E D2:|\ % no line-break in score
-M:12/8                % change of meter
-[2 E2E EFE E2E EFG|\  % no line-break in score
-M:9/8                 % change of meter
-A2G F2E D2|]
-
-X:3
-T:William and Nancy
-T:New Mown Hay
-T:Legacy, The
-C:Trad.
-O:England; Gloucs; Bledington % place of origin
-B:Sussex Tune Book            % can be found in these books
-B:Mally's Cotswold Morris vol.1 2
-D:Morris On                   % can be heard on this record
-P:(AB)2(AC)2A                 % play the parts in this order
-M:6/8
-K:G                        
-[P:A] D|"G"G2G GBd|"C"e2e "G"dBG|"D7"A2d "G"BAG|"C"E2"D7"F "G"G2:|
-[P:B] d|"G"e2d B2d|"C"gfe "G"d2d| "G"e2d    B2d|"C"gfe    "D7"d2c|
-        "G"B2B Bcd|"C"e2e "G"dBG|"D7"A2d "G"BAG|"C"E2"D7"F "G"G2:|
-% changes of meter, using inline fields
-[T:Slows][M:4/4][L:1/4][P:C]"G"d2|"C"e2 "G"d2|B2 d2|"Em"gf "A7"e2|"D7"d2 "G"d2|\
-       "C"e2 "G"d2|[M:3/8][L:1/8] "G"B2 d |[M:6/8] "C"gfe "D7"d2c|
-        "G"B2B Bcd|"C"e2e "G"dBG|"D7"A2d "G"BAG|"C"E2"D7"F "G"G2:|
-
-X:4
-T:South Downs Jig
-R:jig
-S:Robert Harbron
-M:6/8
-L:1/8
-K:G
-|: d | dcA G3 | EFG AFE | DEF GAB | cde d2d |
-dcA G3 | EFG AFE | DEF GAB | cAF G2 :|
-B | Bcd e2c | d2B c2A | Bcd e2c | [M:9/8]d2B c2B A3 |
-[M:6/8]DGF E3 | cBA FED | DEF GAB |1 cAF G2 :|2 cAF G3 |]
-
-X:5
-T:Atholl Brose
-% in this example, which reproduces Highland Bagpipe gracing,
-%  the large number of grace notes mean that it is more convenient to be specific about
-%  score line-breaks (using the $ symbol), rather than using code line breaks to indicate them
-I:linebreak $
-K:D
-{gcd}c<{e}A {gAGAG}A2 {gef}e>A {gAGAG}Ad|
-{gcd}c<{e}A {gAGAG}A>e {ag}a>f {gef}e>d|
-{gcd}c<{e}A {gAGAG}A2 {gef}e>A {gAGAG}Ad|
-{g}c/d/e {g}G>{d}B {gf}gG {dc}d>B:|$
-{g}c<e {gf}g>e {ag}a>e {gf}g>e|
-{g}c<e {gf}g>e {ag}a2 {GdG}a>d|
-{g}c<e {gf}g>e {ag}a>e {gf}g>f|
-{gef}e>d {gf}g>d {gBd}B<{e}G {dc}d>B|
-{g}c<e {gf}g>e {ag}a>e {gf}g>e|
-{g}c<e {gf}g>e {ag}a2 {GdG}ad|
-{g}c<{GdG}e {gf}ga {f}g>e {g}f>d|
-{g}e/f/g {Gdc}d>c {gBd}B<{e}G {dc}d2|]
-
-X:6
-T:Untitled Reel
-C:Trad.
-K:D
-eg|a2ab ageg|agbg agef|g2g2 fgag|f2d2 d2:|\
-ed|cecA B2ed|cAcA E2ed|cecA B2ed|c2A2 A2:|
-K:G
-AB|cdec BcdB|ABAF GFE2|cdec BcdB|c2A2 A2:|
-
-X:7
-T:Kitchen Girl
-C:Trad.
-K:D
-[c4a4] [B4g4]|efed c2cd|e2f2 gaba|g2e2 e2fg|
-a4 g4|efed cdef|g2d2 efed|c2A2 A4:|
-K:G
-ABcA BAGB|ABAG EDEG|A2AB c2d2|e3f edcB|ABcA BAGB|
-ABAG EGAB|cBAc BAG2|A4 A4:|
-
-%abc-2.1
-%%pagewidth      21cm
-%%pageheight     29.7cm
-%%topspace       0.5cm
-%%topmargin      1cm
-%%botmargin      0cm
-%%leftmargin     1cm
-%%rightmargin    1cm
-%%titlespace     0cm
-%%titlefont      Times-Bold 32
-%%subtitlefont   Times-Bold 24
-%%composerfont   Times 16
-%%vocalfont      Times-Roman 14
-%%staffsep       60pt
-%%sysstaffsep    20pt
-%%musicspace     1cm
-%%vocalspace     5pt
-%%measurenb      0
-%%barsperstaff   5
-%%scale          0.7
-X: 1
-T: Canzonetta a tre voci
-C: Claudio Monteverdi (1567-1643)
-M: C
-L: 1/4
-Q: "Andante mosso" 1/4 = 110
-%%score [1 2 3]
-V: 1 clef=treble name="Soprano"sname="A"
-V: 2 clef=treble name="Alto"   sname="T"
-V: 3 clef=bass middle=d name="Tenor"  sname="B"
-%%MIDI program 1 75 % recorder
-%%MIDI program 2 75
-%%MIDI program 3 75
-K: Eb
-% 1 - 4
-[V: 1] |:z4  |z4  |f2ec         |_ddcc        |
-w: Son que-sti~i cre-spi cri-ni~e
-w: Que-sti son gli~oc-chi che mi-
-[V: 2] |:c2BG|AAGc|(F/G/A/B/)c=A|B2AA         |
-w: Son que-sti~i cre-spi cri-ni~e que - - - - sto~il vi-so e
-w: Que-sti son~gli oc-chi che mi-ran - - - - do fi-so mi-
-[V: 3] |:z4  |f2ec|_ddcf        |(B/c/_d/e/)ff|
-w: Son que-sti~i cre-spi cri-ni~e que - - - - sto~il
-w: Que-sti son~gli oc-chi che mi-ran - - - - do
-% 5 - 9
-[V: 1] cAB2     |cAAA |c3B|G2!fermata!Gz ::e4|
-w: que-sto~il vi-so ond' io ri-man-go~uc-ci-so. Deh,
-w: ran-do fi-so, tut-to re-stai con-qui-so.
-[V: 2] AAG2     |AFFF |A3F|=E2!fermata!Ez::c4|
-w: que-sto~il vi-so ond' io ri-man-go~uc-ci-so. Deh,
-w: ran-do fi-so tut-to re-stai con-qui-so.
-[V: 3] (ag/f/e2)|A_ddd|A3B|c2!fermata!cz ::A4|
-w: vi - - - so ond' io ti-man-go~uc-ci-so. Deh,
-w: fi - - - so tut-to re-stai con-qui-so.
-% 10 - 15
-[V: 1] f_dec |B2c2|zAGF  |\
-w: dim-me-lo ben mi-o, che que-sto\
-=EFG2          |1F2z2:|2F8|] % more notes
-w: sol de-si-o_. % more lyrics
-[V: 2] ABGA  |G2AA|GF=EF |(GF3/2=E//D//E)|1F2z2:|2F8|]
-w: dim-me-lo ben mi-o, che que-sto sol de-si - - - - o_.
-[V: 3] _dBc>d|e2AF|=EFc_d|c4             |1F2z2:|2F8|]
-w: dim-me-lo ben mi-o, che que-sto sol de-si-o_.
--- a/demo/kitchen-sink/docs/lean.lean
+++ b/demo/kitchen-sink/docs/lean.lean
@ -1,9 +0,0 @@
-import logic
-section
-  variables (A : Type) (p q : A → Prop)
-
-  example : (∀x : A, p x ∧ q x) → ∀y : A, p y  :=
-  assume H : ∀x : A, p x ∧ q x,
-  take y : A,
-  show p y, from and.elim_left (H y)
-end
--- a/demo/kitchen-sink/docs/mask.mask
+++ b/demo/kitchen-sink/docs/mask.mask
@ -1,52 +0,0 @@
-/* Mask Syntax Demo */
-
-div > ' Test ~[name]';
-
-define :userProfile {
-	header {
-		h4 > @title;
-		button.close;
-	}
-}
-
-:userProfile {
-	@title > ' Hello ~[: username.toUpperCase()]'
-}
-
-style {
-    html, body {
-        background: url('name.png') 0 0 no-repeat;
-    }
-}
-
-button {
-	event click (e) {
-	    this.textContent = `name ${e.clientX} !`;
-	}
-}
-
-md > """
-
- div
- span
- 
-Hello
-
-[one](http://google.com)
-
-""";
-
-
-header .foo > 'Heading'
-
-button .baz x-signal='click: test' disabled > "
-	Hello,
-	world 
-	\"Buddy\"
-"
-
-var a = {
-    name: `name ${window.innerWidth}`
-};
-
-span .foo > "~[bind: a.name]"
--- a/demo/kitchen-sink/docs/ruby.rb
+++ b/demo/kitchen-sink/docs/ruby.rb
@ -20,7 +20,7 @@ class Range
  end
 end

-{:id => ?", :key => "value"}
+{:id => 34, :key => "value"}


    herDocs = [<<'FOO', <<BAR, <<-BAZ, <<-`EXEC`] #comment
--- a/demo/kitchen-sink/docs/sqlserver.sqlserver
+++ b/demo/kitchen-sink/docs/sqlserver.sqlserver
@ -1,72 +0,0 @@
-- =============================================
-- Author:		Morgan Yarbrough
-- Create date: 4/27/2015
-- Description:	Test procedure that shows off language features.
-- 				Includes non-standard folding with region comments using either
-- 				line comments or block comments (both are demonstrated below).
--				This mode imitates SSMS and it designed to be used with SQL Server theme.
-- =============================================
-CREATE PROCEDURE dbo.TestProcedure
-	
--#region parameters
-	@vint INT = 1
-	,@vdate DATE = NULL
-	,@vdatetime DATETIME = DATEADD(dd, 1, GETDATE())
-	,@vvarchar VARCHAR(MAX) = ''
--#endregion
-
-AS
-BEGIN
-
-	/*#region set statements */
-	SET NOCOUNT ON;
-	SET XACT_ABORT ON;
-	SET QUOTED_IDENTIFIER ON;
-	/*#endregion*/
-	
-	/**
-	 * These comments will produce a fold widget
-	 */
-	
-	-- folding demonstration
-	SET @vint = CASE
-					WHEN @vdate IS NULL
-						THEN 1
-					ELSE 2
-				END
-	
-	-- another folding demonstration
-	IF @vint = 1 
-	BEGIN
-		SET @vvarchar = 'one'
-		SET @vint = DATEDIFF(dd, @vdate, @vdatetime)
-	END
-	
-	-- this mode handles strings properly
-	DECLARE @sql NVARCHAR(4000) = N'SELECT TOP(1) OrderID 
-									FROM Orders
-									WHERE @OrderDate > GETDATE()'
-								
-	-- this mode is aware of built in stored procedures 
-	EXECUTE sp_executesql @sql
-	
-	-- demonstrating some syntax highlighting
-	SELECT Orders.OrderID
-		,Customers.CompanyName
-		,DATEFROMPARTS(YEAR(GETDATE()), 1, 1) AS FirstDayOfYear
-	FROM Orders
-	INNER JOIN Customers
-		ON Orders.CustomerID = Customers.CustomerID
-	WHERE CompanyName NOT LIKE '%something'
-		OR CompanyName IS NULL
-		OR CompanyName IN ('bla', 'nothing')
-		
-	-- this mode includes snippets
-	-- place your cusor at the end of the line below and trigger auto complete (Ctrl+Space)
-	createpr
-	
-	-- SQL Server allows using keywords as object names (not recommended) as long as they are wrapped in brackets
-	DATABASE -- keyword
-	[DATABASE] -- not a keyword
-	
-END
--- a/demo/kitchen-sink/inline_editor.js
+++ b/demo/kitchen-sink/inline_editor.js
@ -53,16 +53,16 @@ require("ace/commands/default_commands").commands.push({
            return;
        }
        
-        var rowCount = 10;
+        var rowCount = 10;        
        var w = {
            row: row, 
           // rowCount: rowCount, 
            fixedWidth: true,
            el: dom.createElement("div"),
-            editor: inlineEditor
+            editor: editor
        };
        var el = w.el;
-        el.appendChild(inlineEditor.container);
+        el.appendChild(inlineEditor.container);      

        if (!editor.session.widgetManager) {
            editor.session.widgetManager = new LineWidgets(editor.session);
--- a/demo/static-highlighter.html
+++ b/demo/static-highlighter.html
@ -2,13 +2,13 @@
 <html lang="en">
 <head>
  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <title>Static Code highlighter using Ace</title>
-    <meta name="author" content="Matthew Kastor">
+	<title>Static Code highlighter using Ace</title>
+	<meta name="author" content="Matthew Kastor">
    <style type="text/css">
        .code {
            width: 50%;
+            position: relative;
            white-space: pre-wrap;
-            border: solid lightgrey 1px
        }
    </style>
 </head>
@ -21,8 +21,9 @@
 <div class="code" ace-mode="ace/mode/css" ace-theme="ace/theme/chrome" ace-gutter="true">
 .code {
    width: 50%;
+    
+    position: relative;
    white-space: pre-wrap;
-    border: solid lightgrey 1px
 }

 </div>
@ -34,26 +35,6 @@ function wobble (flam) {

 </pre>

-
-<div class="code" ace-mode="ace/mode/lua" ace-theme="ace/theme/chrome" ace-gutter="true" style="width: 30em;">
--[[--
-num_args takes in 5.1 byte code and extracts the number of arguments from its function header.
--]]--
-
-function int(t)
-    return t:byte(1) + t:byte(2) * 0x100 + t:byte(3) * 0x10000 + t:byte(4) * 0x1000000
-end
-
-function num_args(func)
-    local dump = string.dump(func)
-    local offset, cursor = int(dump:sub(13)), offset + 26
-    --Get the params and var flag (whether there's a ... in the param)
-    return dump:sub(cursor):byte(), dump:sub(cursor+1):byte()
-end
-
-</div>
-
-
 <script src="kitchen-sink/require.js"></script>
 <script>
 require.config({paths: { "ace" : "../lib/ace"}});
--- a/demo/static-highlighter/server.js
+++ b/demo/static-highlighter/server.js
@ -2,13 +2,15 @@
 * Simple node.js server, which generates the synax highlighted version of itself 
 * using the Ace modes and themes on the server and serving a static web page.
 */
-
+// $'
 // include ace search path and modules
 require("amd-loader");

+// load jsdom, which is required by Ace
+require("../../lib/ace/test/mockdom");
+
 var http = require("http");
 var fs = require("fs");
-var resolve = require("path").resolve;

 // load the highlighter and the desired mode and theme
 var highlighter = require("../../lib/ace/ext/static_highlight");
@ -18,22 +20,15 @@ var theme = require("../../lib/ace/theme/twilight");
 var port = process.env.PORT || 2222;

 http.createServer(function(req, res) {
-    var url = req.url;
-    var path = /[^#?\x00]*/.exec(url)[0];
-    var root = resolve(__dirname + "/../../").replace(/\\/g, "/");
-    path = resolve(root + "/" + path).replace(/\\/g, "/");
-    if (path.indexOf(root + "/") != 0)
-        path = __filename;
    res.writeHead(200, {"Content-Type": "text/html; charset=utf-8"});
-    fs.readFile(path, "utf8", function(err, data) {
-        if (err) data = err.message;
+    fs.readFile(__filename, "utf8", function(err, data) {
        var highlighted = highlighter.render(data, new JavaScriptMode(), theme);
        res.end(
            '<html><body>\n' +
                '<style type="text/css" media="screen">\n' +
                    highlighted.css +
                '</style>\n' + 
-                highlighted.html +
+                highlighted.html +            
            '</body></html>'
        );
    });
--- a/doc/Contributor_License_Agreement-v2.pdf
+++ b/doc/Contributor_License_Agreement-v2.pdf
--- a/doc/Corporate_Contributor_License_Agreement-v2.pdf
+++ b/doc/Corporate_Contributor_License_Agreement-v2.pdf
--- a/doc/site/images/lws-logo.png
+++ b/doc/site/images/lws-logo.png
--- a/doc/site/js/main.js
+++ b/doc/site/js/main.js
@ -18,7 +18,7 @@ $(function() {
        });
        
        ace.config.loadModule("ace/ext/emmet", function() {
-            ace.require("ace/lib/net").loadScript("http://cloud9ide.github.io/emmet-core/emmet.js", function() {
+            ace.require("ace/lib/net").loadScript("http://nightwing.github.io/emmet-core/emmet.js", function() {
                embedded_editor.setOption("enableEmmet", true);
                editor.setOption("enableEmmet", true);
            });
--- a/experiments/debug_mem_leak.html
+++ b/experiments/debug_mem_leak.html
@ -1,59 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <script src="../demo/kitchen-sink/require.js"></script>
-        <script type="text/javascript">
-            require.config({
-                paths: { ace: "../lib/ace" },
-                waitSeconds: 0
-            });
-        </script>
-    </head>
-    <body>
-        <p><button onclick="toggleEditor()">Toggle editor</button></p>
-
-        <div id="container"></div>
-        <script>
-            var editor;
-            var counter = 0
-
-            function toggleEditor() {
-                if (!editor) {
-                    var root = document.createElement("div");
-                    root.style.height = "100px";
-                    root.setAttribute("id", "editor");
-                    root.textContent = "function foo(items) {\nvar x = 'All this is syntax highlighted';\nreturn x;\n}";
-
-                    document.getElementById("container").appendChild(root);
-
-                    editor = ace.edit(root);
-
-                    if (counter++ % 2)
-                        editor.setTheme("ace/theme/monokai");
-                    else
-                        editor.setTheme("ace/theme/clouds");
-
-                    editor.session.setMode("ace/mode/javascript");
-                } else {
-                    editor.destroy();
-                    var el = editor.container;
-                    el.parentNode.removeChild(el);
-
-                    editor.container = null
-                    editor.renderer = null
-
-                    editor = null;
-
-                    var root = document.getElementById("editor")
-                    if (root)
-                        root.parentNode.removeChild(root);
-                }
-            }
-            require(["ace/ace"], function(ace) {
-                window.ace = ace;
-                toggleEditor();            
-            })
-        </script>
-    </body>
-</html>
--- a/index.html
+++ b/index.html
--- a/kitchen-sink.html
+++ b/kitchen-sink.html
@ -257,9 +257,7 @@
  <a href="http://ace.c9.io">
    <img id="ace-logo" src="doc/site/images/ace-logo.png" style="width: 134px;margin: 46px 0px 4px 66px;">
  </a>
-  <div><a target="_test" href="./lib/ace/test/tests.html"
-    style="color: whitesmoke; text-align: left; padding: 1em;">tests</a>
-  </div>
+
  </div>
  </div>
 </div>
--- a/lib/ace/anchor.js
+++ b/lib/ace/anchor.js
@ -99,54 +99,72 @@ var Anchor = exports.Anchor = function(doc, row, column) {
     *  - `value`: An object describing the new Anchor position
     *
     **/
-    this.onChange = function(delta) {
-        if (delta.start.row == delta.end.row && delta.start.row != this.row)
+    this.onChange = function(e) {
+        var delta = e.data;
+        var range = delta.range;
+
+        if (range.start.row == range.end.row && range.start.row != this.row)
            return;

-        if (delta.start.row > this.row)
+        if (range.start.row > this.row)
            return;
-            
-        var point = $getTransformedPoint(delta, {row: this.row, column: this.column}, this.$insertRight);
-        this.setPosition(point.row, point.column, true);
+
+        if (range.start.row == this.row && range.start.column > this.column)
+            return;
+
+        var row = this.row;
+        var column = this.column;
+        var start = range.start;
+        var end = range.end;
+
+        if (delta.action === "insertText") {
+            if (start.row === row && start.column <= column) {
+                if (start.column === column && this.$insertRight) {
+                    // do nothing
+                } else if (start.row === end.row) {
+                    column += end.column - start.column;
+                } else {
+                    column -= start.column;
+                    row += end.row - start.row;
+                }
+            } else if (start.row !== end.row && start.row < row) {
+                row += end.row - start.row;
+            }
+        } else if (delta.action === "insertLines") {
+            if (start.row === row && column === 0 && this.$insertRight) {
+                // do nothing
+            }
+            else if (start.row <= row) {
+                row += end.row - start.row;
+            }
+        } else if (delta.action === "removeText") {
+            if (start.row === row && start.column < column) {
+                if (end.column >= column)
+                    column = start.column;
+                else
+                    column = Math.max(0, column - (end.column - start.column));
+
+            } else if (start.row !== end.row && start.row < row) {
+                if (end.row === row)
+                    column = Math.max(0, column - end.column) + start.column;
+                row -= (end.row - start.row);
+            } else if (end.row === row) {
+                row -= end.row - start.row;
+                column = Math.max(0, column - end.column) + start.column;
+            }
+        } else if (delta.action == "removeLines") {
+            if (start.row <= row) {
+                if (end.row <= row)
+                    row -= end.row - start.row;
+                else {
+                    row = start.row;
+                    column = 0;
+                }
+            }
+        }
+
+        this.setPosition(row, column, true);
    };
-    
-    function $pointsInOrder(point1, point2, equalPointsInOrder) {
-        var bColIsAfter = equalPointsInOrder ? point1.column <= point2.column : point1.column < point2.column;
-        return (point1.row < point2.row) || (point1.row == point2.row && bColIsAfter);
-    }
-            
-    function $getTransformedPoint(delta, point, moveIfEqual) {
-        // Get delta info.
-        var deltaIsInsert = delta.action == "insert";
-        var deltaRowShift = (deltaIsInsert ? 1 : -1) * (delta.end.row    - delta.start.row);
-        var deltaColShift = (deltaIsInsert ? 1 : -1) * (delta.end.column - delta.start.column);
-        var deltaStart = delta.start;
-        var deltaEnd = deltaIsInsert ? deltaStart : delta.end; // Collapse insert range.
-        
-        // DELTA AFTER POINT: No change needed.
-        if ($pointsInOrder(point, deltaStart, moveIfEqual)) {
-            return {
-                row: point.row,
-                column: point.column
-            };
-        }
-        
-        // DELTA BEFORE POINT: Move point by delta shift.
-        if ($pointsInOrder(deltaEnd, point, !moveIfEqual)) {
-            return {
-                row: point.row + deltaRowShift,
-                column: point.column + (point.row == deltaEnd.row ? deltaColShift : 0)
-            };
-        }
-        
-        // DELTA ENVELOPS POINT (delete only): Move point to delta start.
-        // TODO warn if delta.action != "remove" ?
-        
-        return {
-            row: deltaStart.row,
-            column: deltaStart.column
-        };
-    }

    /**
     * Sets the anchor position to the specified row and column. If `noClip` is `true`, the position is not clipped.
--- a/lib/ace/anchor_test.js
+++ b/lib/ace/anchor_test.js
@ -71,7 +71,7 @@ module.exports = {
        var doc = new Document("juhu\nkinners");
        var anchor = new Anchor(doc, 1, 4);
        
-        doc.insertFullLines(1, ["123", "456"]);
+        doc.insertLines(1, ["123", "456"]);
        assert.position(anchor.getPosition(), 3, 4);    
    },

@ -105,7 +105,7 @@ module.exports = {
        var doc = new Document("juhu\nkinners");
        var anchor = new Anchor(doc, 1, 4);
        
-        doc.insertMergedLines({row: 0, column: 0}, ['', '']);
+        doc.insertNewLine({row: 0, column: 0});
        assert.position(anchor.getPosition(), 2, 4);    
    },
    
@ -113,7 +113,7 @@ module.exports = {
        var doc = new Document("juhu\nkinners");
        var anchor = new Anchor(doc, 1, 4);
        
-        doc.insertMergedLines({row: 1, column: 2}, ['', '']);
+        doc.insertNewLine({row: 1, column: 2});
        assert.position(anchor.getPosition(), 2, 2);
    },
    
@ -145,7 +145,7 @@ module.exports = {
        var doc = new Document("juhu\n1\n2\nkinners");
        var anchor = new Anchor(doc, 3, 4);
        
-        doc.removeFullLines(1, 2);
+        doc.removeLines(1, 2);
        assert.position(anchor.getPosition(), 1, 4);
    },
    
@ -169,7 +169,7 @@ module.exports = {
        var doc = new Document("juhu\nkinners\n123");
        var anchor = new Anchor(doc, 1, 5);
        
-        doc.removeFullLines(1, 1);
+        doc.removeLines(1, 1);
        assert.position(anchor.getPosition(), 1, 0);
    },
    
@ -208,9 +208,9 @@ module.exports = {
        var doc = new Document("juhu\nkinners\n123");
        var anchor = new Anchor(doc, 2, 4);
        
-        doc.removeFullLines(0, 3);
+        doc.removeLines(0, 3);
        assert.position(anchor.getPosition(), 0, 0);
-        doc.insertFullLines(0, ["a", "b", "c"]);        
+        doc.insertLines(0, ["a", "b", "c"]);        
        assert.position(anchor.getPosition(), 3, 0);
        assert.equal(doc.getValue(), "a\nb\nc\n");
    }
--- a/lib/ace/apply_delta.js
+++ b/lib/ace/apply_delta.js
@ -1,108 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Distributed under the BSD license:
- *
- * Copyright (c) 2010, Ajax.org B.V.
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Ajax.org B.V. nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define(function(require, exports, module) {
-"use strict";
-
-function throwDeltaError(delta, errorText){
-    console.log("Invalid Delta:", delta);
-    throw "Invalid Delta: " + errorText;
-}
-
-function positionInDocument(docLines, position) {
-    return position.row    >= 0 && position.row    <  docLines.length &&
-           position.column >= 0 && position.column <= docLines[position.row].length;
-}
-
-function validateDelta(docLines, delta) {
-    // Validate action string.
-    if (delta.action != "insert" && delta.action != "remove")
-        throwDeltaError(delta, "delta.action must be 'insert' or 'remove'");
-    
-    // Validate lines type.
-    if (!(delta.lines instanceof Array))
-        throwDeltaError(delta, "delta.lines must be an Array");
-
-    // Validate range type.
-    if (!delta.start || !delta.end)
-       throwDeltaError(delta, "delta.start/end must be an present");
-
-    // Validate that the start point is contained in the document.
-    var start = delta.start;
-    if (!positionInDocument(docLines, delta.start))
-        throwDeltaError(delta, "delta.start must be contained in document");
-    
-    // Validate that the end point is contained in the document (remove deltas only).
-    var end = delta.end;
-    if (delta.action == "remove" && !positionInDocument(docLines, end))
-        throwDeltaError(delta, "delta.end must contained in document for 'remove' actions");
-    
-    // Validate that the .range size matches the .lines size.
-    var numRangeRows = end.row - start.row;
-    var numRangeLastLineChars = (end.column - (numRangeRows == 0 ? start.column : 0));
-    if (numRangeRows != delta.lines.length - 1 || delta.lines[numRangeRows].length != numRangeLastLineChars)
-        throwDeltaError(delta, "delta.range must match delta lines");
-}
-
-exports.applyDelta = function(docLines, delta, doNotValidate) {
-    // disabled validation since it breaks autocompletion popup
-    // if (!doNotValidate)
-    //    validateDelta(docLines, delta);
-    
-    var row = delta.start.row;
-    var startColumn = delta.start.column;
-    var line = docLines[row] || "";
-    switch (delta.action) {
-        case "insert":
-            var lines = delta.lines;
-            if (lines.length === 1) {
-                docLines[row] = line.substring(0, startColumn) + delta.lines[0] + line.substring(startColumn);
-            } else {
-                var args = [row, 1].concat(delta.lines);
-                docLines.splice.apply(docLines, args);
-                docLines[row] = line.substring(0, startColumn) + docLines[row];
-                docLines[row + delta.lines.length - 1] += line.substring(startColumn);
-            }
-            break;
-        case "remove":
-            var endColumn = delta.end.column;
-            var endRow = delta.end.row;
-            if (row === endRow) {
-                docLines[row] = line.substring(0, startColumn) + line.substring(endColumn);
-            } else {
-                docLines.splice(
-                    row, endRow - row + 1,
-                    line.substring(0, startColumn) + docLines[endRow].substring(endColumn)
-                );
-            }
-            break;
-    }
-}
-});
--- a/lib/ace/autocomplete.js
+++ b/lib/ace/autocomplete.js
@ -40,10 +40,8 @@ var dom = require("./lib/dom");
 var snippetManager = require("./snippets").snippetManager;

 var Autocomplete = function() {
-    this.autoInsert = false;
+    this.autoInsert = true;
    this.autoSelect = true;
-    this.exactMatch = false;
-    this.gatherCompletionsId = 0;
    this.keyboardHandler = new HashHandler();
    this.keyboardHandler.bindKeys(this.commands);

@ -55,11 +53,12 @@ var Autocomplete = function() {
    this.changeTimer = lang.delayedCall(function() {
        this.updateCompletions(true);
    }.bind(this));
-
+    
    this.tooltipTimer = lang.delayedCall(this.updateDocTooltip.bind(this), 50);
 };

 (function() {
+    this.gatherCompletionsId = 0;

    this.$init = function() {
        this.popup = new AcePopup(document.body || document.documentElement);
@ -73,7 +72,7 @@ var Autocomplete = function() {
        this.popup.on("changeHoverMarker", this.tooltipTimer.bind(null, null));
        return this.popup;
    };
-
+    
    this.getPopup = function() {
        return this.popup || this.$init();
    };
@ -84,8 +83,6 @@ var Autocomplete = function() {

        this.popup.setData(this.completions.filtered);

-        editor.keyBinding.addKeyboardHandler(this.keyboardHandler);
-        
        var renderer = editor.renderer;
        this.popup.setRow(this.autoSelect ? 0 : -1);
        if (!keepPopupPosition) {
@ -100,7 +97,7 @@ var Autocomplete = function() {
            var rect = editor.container.getBoundingClientRect();
            pos.top += rect.top - renderer.layerConfig.offset;
            pos.left += rect.left - editor.renderer.scrollLeft;
-            pos.left += renderer.gutterWidth;
+            pos.left += renderer.$gutterLayer.gutterWidth;

            this.popup.show(pos, lineHeight);
        } else if (keepPopupPosition && !prefix) {
@ -117,10 +114,11 @@ var Autocomplete = function() {
        this.changeTimer.cancel();
        this.hideDocTooltip();

-        this.gatherCompletionsId += 1;
-        if (this.popup && this.popup.isOpen)
+        if (this.popup && this.popup.isOpen) {
+            this.gatherCompletionsId += 1;
            this.popup.hide();
-
+        }
+        
        if (this.base)
            this.base.detach();
        this.activated = false;
@ -142,11 +140,10 @@ var Autocomplete = function() {
        // we have to check if activeElement is a child of popup because
        // on IE preventDefault doesn't stop scrollbar from being focussed
        var el = document.activeElement;
-        var text = this.editor.textInput.getElement();
-        var fromTooltip = e.relatedTarget && e.relatedTarget == this.tooltipNode;
-        var container = this.popup && this.popup.container;
-        if (el != text && el.parentNode != container && !fromTooltip
-            && el != this.tooltipNode && e.relatedTarget != text
+        var text = this.editor.textInput.getElement()
+        if (el != text && el.parentNode != this.popup.container 
+            && el != this.tooltipNode && e.relatedTarget != this.tooltipNode
+            && e.relatedTarget != text
        ) {
            this.detach();
        }
@ -206,6 +203,7 @@ var Autocomplete = function() {
        "Ctrl-Down|Ctrl-End": function(editor) { editor.completer.goTo("end"); },

        "Esc": function(editor) { editor.completer.detach(); },
+        "Space": function(editor) { editor.completer.detach(); editor.insert(" ");},
        "Return": function(editor) { return editor.completer.insertMatch(); },
        "Shift-Return": function(editor) { editor.completer.insertMatch(true); },
        "Tab": function(editor) {
@ -229,7 +227,7 @@ var Autocomplete = function() {

        this.base = session.doc.createAnchor(pos.row, pos.column - prefix.length);
        this.base.$insertRight = true;
-
+        
        var matches = [];
        var total = editor.completers.length;
        editor.completers.forEach(function(completer, i) {
@ -262,6 +260,7 @@ var Autocomplete = function() {
            editor.completer = this;
        }

+        editor.keyBinding.addKeyboardHandler(this.keyboardHandler);
        editor.on("changeSelection", this.changeListener);
        editor.on("blur", this.blurListener);
        editor.on("mousedown", this.mousedownListener);
@ -298,7 +297,7 @@ var Autocomplete = function() {

            var prefix = results.prefix;
            var matches = results && results.matches;
-
+            
            if (!matches || !matches.length)
                return detachIfFinished();

@ -307,10 +306,6 @@ var Autocomplete = function() {
                return;

            this.completions = new FilteredList(matches);
-
-            if (this.exactMatch)
-                this.completions.exactMatch = true;
-
            this.completions.setFilter(prefix);
            var filtered = this.completions.filtered;

@ -333,7 +328,7 @@ var Autocomplete = function() {
    this.cancelContextMenu = function() {
        this.editor.$mouseHandler.cancelContextMenu();
    };
-
+    
    this.updateDocTooltip = function() {
        var popup = this.popup;
        var all = popup.data;
@ -348,14 +343,14 @@ var Autocomplete = function() {
        });
        if (!doc)
            doc = selected;
-
+        
        if (typeof doc == "string")
-            doc = {docText: doc};
+            doc = {docText: doc}
        if (!doc || !(doc.docHTML || doc.docText))
            return this.hideDocTooltip();
        this.showDocTooltip(doc);
    };
-
+    
    this.showDocTooltip = function(item) {
        if (!this.tooltipNode) {
            this.tooltipNode = dom.createElement("div");
@ -365,21 +360,21 @@ var Autocomplete = function() {
            this.tooltipNode.tabIndex = -1;
            this.tooltipNode.onblur = this.blurListener.bind(this);
        }
-
+        
        var tooltipNode = this.tooltipNode;
        if (item.docHTML) {
            tooltipNode.innerHTML = item.docHTML;
        } else if (item.docText) {
            tooltipNode.textContent = item.docText;
        }
-
+        
        if (!tooltipNode.parentNode)
-            document.body.appendChild(tooltipNode);
+            document.body.appendChild(tooltipNode);        
        var popup = this.popup;
        var rect = popup.container.getBoundingClientRect();
        tooltipNode.style.top = popup.container.style.top;
        tooltipNode.style.bottom = popup.container.style.bottom;
-
+        
        if (window.innerWidth - rect.right < 320) {
            tooltipNode.style.right = window.innerWidth - rect.left + "px";
            tooltipNode.style.left = "";
@ -389,7 +384,7 @@ var Autocomplete = function() {
        }
        tooltipNode.style.display = "block";
    };
-
+    
    this.hideDocTooltip = function() {
        this.tooltipTimer.cancel();
        if (!this.tooltipNode) return;
@ -397,7 +392,7 @@ var Autocomplete = function() {
        if (!this.editor.isFocused() && document.activeElement == el)
            this.editor.focus();
        this.tooltipNode = null;
-        if (el.parentNode)
+        if (el.parentNode) 
            el.parentNode.removeChild(el);
    };

@ -408,20 +403,19 @@ Autocomplete.startCommand = {
    exec: function(editor) {
        if (!editor.completer)
            editor.completer = new Autocomplete();
-        editor.completer.autoInsert = false;
+        editor.completer.autoInsert = 
        editor.completer.autoSelect = true;
        editor.completer.showPopup(editor);
-        // prevent ctrl-space opening context menu on firefox on mac
+        // needed for firefox on mac
        editor.completer.cancelContextMenu();
    },
    bindKey: "Ctrl-Space|Ctrl-Shift-Space|Alt-Space"
 };

-var FilteredList = function(array, filterText) {
+var FilteredList = function(array, filterText, mutateData) {
    this.all = array;
    this.filtered = array;
    this.filterText = filterText || "";
-    this.exactMatch = false;
 };
 (function(){
    this.setFilter = function(str) {
@ -458,29 +452,23 @@ var FilteredList = function(array, filterText) {
            var matchMask = 0;
            var penalty = 0;
            var index, distance;
-
-            if (this.exactMatch) {
-                if (needle !== caption.substr(0, needle.length))
+            // caption char iteration is faster in Chrome but slower in Firefox, so lets use indexOf
+            for (var j = 0; j < needle.length; j++) {
+                // TODO add penalty on case mismatch
+                var i1 = caption.indexOf(lower[j], lastIndex + 1);
+                var i2 = caption.indexOf(upper[j], lastIndex + 1);
+                index = (i1 >= 0) ? ((i2 < 0 || i1 < i2) ? i1 : i2) : i2;
+                if (index < 0)
                    continue loop;
-            }else{
-                // caption char iteration is faster in Chrome but slower in Firefox, so lets use indexOf
-                for (var j = 0; j < needle.length; j++) {
-                    // TODO add penalty on case mismatch
-                    var i1 = caption.indexOf(lower[j], lastIndex + 1);
-                    var i2 = caption.indexOf(upper[j], lastIndex + 1);
-                    index = (i1 >= 0) ? ((i2 < 0 || i1 < i2) ? i1 : i2) : i2;
-                    if (index < 0)
-                        continue loop;
-                    distance = index - lastIndex - 1;
-                    if (distance > 0) {
-                        // first char mismatch should be more sensitive
-                        if (lastIndex === -1)
-                            penalty += 10;
-                        penalty += distance;
-                    }
-                    matchMask = matchMask | (1 << index);
-                    lastIndex = index;
+                distance = index - lastIndex - 1;
+                if (distance > 0) {
+                    // first char mismatch should be more sensitive
+                    if (lastIndex === -1)
+                        penalty += 10;
+                    penalty += distance;
                }
+                matchMask = matchMask | (1 << index);
+                lastIndex = index;
            }
            item.matchMask = matchMask;
            item.exactMatch = penalty ? 0 : 1;
--- a/lib/ace/autocomplete/popup.js
+++ b/lib/ace/autocomplete/popup.js
@ -31,6 +31,7 @@
 define(function(require, exports, module) {
 "use strict";

+var EditSession = require("../edit_session").EditSession;
 var Renderer = require("../virtual_renderer").VirtualRenderer;
 var Editor = require("../editor").Editor;
 var Range = require("../range").Range;
@ -196,12 +197,8 @@ var AcePopup = function(parentNode) {

        if (data.meta) {
            var maxW = popup.renderer.$size.scrollerWidth / popup.renderer.layerConfig.characterWidth;
-            var metaData = data.meta;
-            if (metaData.length + data.caption.length > maxW - 2) {
-                // trim meta to fit this popup and add ellipsis
-                metaData = metaData.substr(0, maxW - data.caption.length - 3) + "\u2026"
-            }
-            tokens.push({type: "rightAlignedText", value: metaData});
+            if (data.meta.length + data.caption.length < maxW - 2)
+                tokens.push({type: "rightAlignedText", value: data.meta});
        }
        return tokens;
    };
@ -212,16 +209,14 @@ var AcePopup = function(parentNode) {
        return this.screenWidth = 0;
    };

-    popup.$blockScrolling = Infinity;
-
    // public
    popup.isOpen = false;
    popup.isTopdown = false;

    popup.data = [];
    popup.setData = function(list) {
-        popup.setValue(lang.stringRepeat("\n", list.length), -1);
        popup.data = list || [];
+        popup.setValue(lang.stringRepeat("\n", list.length), -1);
        popup.setRow(0);
    };
    popup.getData = function(row) {
@ -246,7 +241,6 @@ var AcePopup = function(parentNode) {
    popup.on("changeSelection", function() {
        if (popup.isOpen)
            popup.setRow(popup.selection.lead.row);
-        popup.renderer.scrollCursorIntoView();
    });

    popup.hide = function() {
@ -341,4 +335,4 @@ dom.importCssString("\

 exports.AcePopup = AcePopup;

-});
+});
--- a/lib/ace/background_tokenizer.js
+++ b/lib/ace/background_tokenizer.js
@ -68,10 +68,11 @@ var BackgroundTokenizer = function(tokenizer, editor) {
        var endLine = -1;
        var doc = self.doc;

-        var startLine = currentLine;
        while (self.lines[currentLine])
            currentLine++;
-        
+
+        var startLine = currentLine;
+
        var len = doc.getLength();
        var processedLines = 0;
        self.running = false;
@ -171,12 +172,13 @@ var BackgroundTokenizer = function(tokenizer, editor) {
    }

    this.$updateOnChange = function(delta) {
-        var startRow = delta.start.row;
-        var len = delta.end.row - startRow;
+        var range = delta.range;
+        var startRow = range.start.row;
+        var len = range.end.row - startRow;

        if (len === 0) {
            this.lines[startRow] = null;
-        } else if (delta.action == "remove") {
+        } else if (delta.action == "removeText" || delta.action == "removeLines") {
            this.lines.splice(startRow, len + 1, null);
            this.states.splice(startRow, len + 1, null);
        } else {
--- a/lib/ace/background_tokenizer_test.js
+++ b/lib/ace/background_tokenizer_test.js
@ -75,49 +75,6 @@ module.exports = {
        
        forceTokenize(doc)
        testStates(doc, ["comment_regex_allowed", "start", "no_regex"])
-    },
-    "test background tokenizer sends update event" : function() {
-        var doc = new EditSession([
-            "/*",
-            "var",
-            "juhu",
-            "*/"
-        ]);
-        doc.setMode("./mode/javascript");
-        
-        var updateEvent = null;
-        doc.bgTokenizer.on("update", function(e) {
-            updateEvent = e.data;
-        });
-        function checkEvent(first, last) {
-            assert.ok(!updateEvent, "unneccessary update event");
-            doc.bgTokenizer.running = 1;
-            doc.bgTokenizer.$worker();
-            assert.ok(updateEvent);
-            assert.equal([first, last] + "", 
-                [updateEvent.first, updateEvent.last] + "")
-            updateEvent = null;
-        }
-        
-        forceTokenize(doc);
-        var comment = "comment_regex_allowed";
-        testStates(doc, [comment, comment, comment, "start"]);
-        
-        doc.remove(new Range(0,0,0,2));
-        testStates(doc, [comment, comment, comment, "start"]);
-        
-        checkEvent(0, 3);
-        testStates(doc, ["start", "no_regex", "no_regex", "regex"]);
-        
-        // insert /* and and press down several times quickly
-        doc.insert({row:0, column:0}, "/*");
-        doc.getTokens(0);
-        doc.getTokens(1);
-        doc.getTokens(2);
-        checkEvent(0, 3);
-        
-        forceTokenize(doc);
-        testStates(doc, [comment, comment, comment, "start"]);
    }
 };

--- a/lib/ace/commands/default_commands.js
+++ b/lib/ace/commands/default_commands.js
@ -97,33 +97,29 @@ exports.commands = [{
    name: "fold",
    bindKey: bindKey("Alt-L|Ctrl-F1", "Command-Alt-L|Command-F1"),
    exec: function(editor) { editor.session.toggleFold(false); },
-    multiSelectAction: "forEach",
    scrollIntoView: "center",
    readOnly: true
 }, {
    name: "unfold",
    bindKey: bindKey("Alt-Shift-L|Ctrl-Shift-F1", "Command-Alt-Shift-L|Command-Shift-F1"),
    exec: function(editor) { editor.session.toggleFold(true); },
-    multiSelectAction: "forEach",
    scrollIntoView: "center",
    readOnly: true
 }, {
    name: "toggleFoldWidget",
    bindKey: bindKey("F2", "F2"),
    exec: function(editor) { editor.session.toggleFoldWidget(); },
-    multiSelectAction: "forEach",
    scrollIntoView: "center",
    readOnly: true
 }, {
    name: "toggleParentFoldWidget",
    bindKey: bindKey("Alt-F2", "Alt-F2"),
    exec: function(editor) { editor.session.toggleFoldWidget(true); },
-    multiSelectAction: "forEach",
    scrollIntoView: "center",
    readOnly: true
 }, {
    name: "foldall",
-    bindKey: bindKey(null, "Ctrl-Command-Option-0"),
+    bindKey: bindKey("Ctrl-Alt-0", "Ctrl-Command-Option-0"),
    exec: function(editor) { editor.session.foldAll(); },
    scrollIntoView: "center",
    readOnly: true
@ -209,14 +205,12 @@ exports.commands = [{
    bindKey: bindKey("Shift-Up", "Shift-Up"),
    exec: function(editor) { editor.getSelection().selectUp(); },
    multiSelectAction: "forEach",
-    scrollIntoView: "cursor",
    readOnly: true
 }, {
    name: "golineup",
    bindKey: bindKey("Up", "Up|Ctrl-P"),
    exec: function(editor, args) { editor.navigateUp(args.times); },
    multiSelectAction: "forEach",
-    scrollIntoView: "cursor",
    readOnly: true
 }, {
    name: "selecttoend",
@ -401,34 +395,19 @@ exports.commands = [{
    bindKey: bindKey("Ctrl-P", "Ctrl-P"),
    exec: function(editor) { editor.jumpToMatching(); },
    multiSelectAction: "forEach",
-    scrollIntoView: "animate",
    readOnly: true
 }, {
    name: "selecttomatching",
    bindKey: bindKey("Ctrl-Shift-P", "Ctrl-Shift-P"),
    exec: function(editor) { editor.jumpToMatching(true); },
    multiSelectAction: "forEach",
-    scrollIntoView: "animate",
-    readOnly: true
-}, {
-    name: "expandToMatching",
-    bindKey: bindKey("Ctrl-Shift-M", "Ctrl-Shift-M"),
-    exec: function(editor) { editor.jumpToMatching(true, true); },
-    multiSelectAction: "forEach",
-    scrollIntoView: "animate",
    readOnly: true
 }, {
    name: "passKeysToBrowser",
-    bindKey: bindKey(null, null),
+    bindKey: bindKey("null", "null"),
    exec: function() {},
    passEvent: true,
    readOnly: true
-}, {
-    name: "copy",
-    exec: function(editor) {
-        // placeholder for replay macro
-    },
-    readOnly: true
 },

 // commands disabled in readOnly mode
@ -445,12 +424,6 @@ exports.commands = [{
    },
    scrollIntoView: "cursor",
    multiSelectAction: "forEach"
-}, {
-    name: "paste",
-    exec: function(editor, args) {
-        editor.$handlePaste(args);
-    },
-    scrollIntoView: "cursor"
 }, {
    name: "removeline",
    bindKey: bindKey("Ctrl-D", "Command-D"),
@ -485,13 +458,11 @@ exports.commands = [{
    name: "modifyNumberUp",
    bindKey: bindKey("Ctrl-Shift-Up", "Alt-Shift-Up"),
    exec: function(editor) { editor.modifyNumber(1); },
-    scrollIntoView: "cursor",
    multiSelectAction: "forEach"
 }, {
    name: "modifyNumberDown",
    bindKey: bindKey("Ctrl-Shift-Down", "Alt-Shift-Down"),
    exec: function(editor) { editor.modifyNumber(-1); },
-    scrollIntoView: "cursor",
    multiSelectAction: "forEach"
 }, {
    name: "replace",
@ -658,7 +629,7 @@ exports.commands = [{
        var isBackwards = editor.selection.isBackwards();
        var selectionStart = isBackwards ? editor.selection.getSelectionLead() : editor.selection.getSelectionAnchor();
        var selectionEnd = isBackwards ? editor.selection.getSelectionAnchor() : editor.selection.getSelectionLead();
-        var firstLineEndCol = editor.session.doc.getLine(selectionStart.row).length;
+        var firstLineEndCol = editor.session.doc.getLine(selectionStart.row).length
        var selectedText = editor.session.doc.getTextRange(editor.selection.getRange());
        var selectedCount = selectedText.replace(/\n\s*/, " ").length;
        var insertLine = editor.session.doc.getLine(selectionStart.row);
@ -669,7 +640,7 @@ exports.commands = [{
                curLine = " " + curLine;
            }
            insertLine += curLine;
-        }
+        };

        if (selectionEnd.row + 1 < (editor.session.doc.getLength() - 1)) {
            // Don't insert a newline at the end of the document
--- a/lib/ace/commands/incremental_search_commands.js
+++ b/lib/ace/commands/incremental_search_commands.js
@ -69,14 +69,18 @@ exports.iSearchCommands = [{
    bindKey: {win: "Ctrl-F", mac: "Command-F"},
    exec: function(iSearch) {
        iSearch.cancelSearch(true);
-    }
+    },
+    readOnly: true,
+    isIncrementalSearchCommand: true
 }, {
    name: "searchForward",
    bindKey: {win: "Ctrl-S|Ctrl-K", mac: "Ctrl-S|Command-G"},
    exec: function(iSearch, options) {
        options.useCurrentOrPrevSearch = true;
        iSearch.next(options);
-    }
+    },
+    readOnly: true,
+    isIncrementalSearchCommand: true
 }, {
    name: "searchBackward",
    bindKey: {win: "Ctrl-R|Ctrl-Shift-K", mac: "Ctrl-R|Command-Shift-G"},
@ -84,30 +88,42 @@ exports.iSearchCommands = [{
        options.useCurrentOrPrevSearch = true;
        options.backwards = true;
        iSearch.next(options);
-    }
+    },
+    readOnly: true,
+    isIncrementalSearchCommand: true
 }, {
    name: "extendSearchTerm",
    exec: function(iSearch, string) {
        iSearch.addString(string);
-    }
+    },
+    readOnly: true,
+    isIncrementalSearchCommand: true
 }, {
    name: "extendSearchTermSpace",
    bindKey: "space",
-    exec: function(iSearch) { iSearch.addString(' '); }
+    exec: function(iSearch) { iSearch.addString(' '); },
+    readOnly: true,
+    isIncrementalSearchCommand: true
 }, {
    name: "shrinkSearchTerm",
    bindKey: "backspace",
    exec: function(iSearch) {
        iSearch.removeChar();
-    }
+    },
+    readOnly: true,
+    isIncrementalSearchCommand: true
 }, {
    name: 'confirmSearch',
    bindKey: 'return',
-    exec: function(iSearch) { iSearch.deactivate(); }
+    exec: function(iSearch) { iSearch.deactivate(); },
+    readOnly: true,
+    isIncrementalSearchCommand: true
 }, {
    name: 'cancelSearch',
    bindKey: 'esc|Ctrl-G',
-    exec: function(iSearch) { iSearch.deactivate(true); }
+    exec: function(iSearch) { iSearch.deactivate(true); },
+    readOnly: true,
+    isIncrementalSearchCommand: true
 }, {
    name: 'occurisearch',
    bindKey: 'Ctrl-O',
@ -115,7 +131,9 @@ exports.iSearchCommands = [{
        var options = oop.mixin({}, iSearch.$options);
        iSearch.deactivate();
        occurStartCommand.exec(iSearch.$editor, options);
-    }
+    },
+    readOnly: true,
+    isIncrementalSearchCommand: true
 }, {
    name: "yankNextWord",
    bindKey: "Ctrl-w",
@ -124,7 +142,9 @@ exports.iSearchCommands = [{
            range = ed.selection.getRangeOfMovements(function(sel) { sel.moveCursorWordRight(); }),
            string = ed.session.getTextRange(range);
        iSearch.addString(string);
-    }
+    },
+    readOnly: true,
+    isIncrementalSearchCommand: true
 }, {
    name: "yankNextChar",
    bindKey: "Ctrl-Alt-y",
@ -133,35 +153,16 @@ exports.iSearchCommands = [{
            range = ed.selection.getRangeOfMovements(function(sel) { sel.moveCursorRight(); }),
            string = ed.session.getTextRange(range);
        iSearch.addString(string);
-    }
+    },
+    readOnly: true,
+    isIncrementalSearchCommand: true
 }, {
    name: 'recenterTopBottom',
    bindKey: 'Ctrl-l',
-    exec: function(iSearch) { iSearch.$editor.execCommand('recenterTopBottom'); }
-}, {
-    name: 'selectAllMatches',
-    bindKey: 'Ctrl-space',
-    exec: function(iSearch) {
-        var ed = iSearch.$editor,
-            hl = ed.session.$isearchHighlight,
-            ranges = hl && hl.cache ? hl.cache
-                .reduce(function(ranges, ea) {
-                    return ranges.concat(ea ? ea : []); }, []) : [];
-        iSearch.deactivate(false);
-        ranges.forEach(ed.selection.addRange.bind(ed.selection));
-    }
-}, {
-    name: 'searchAsRegExp',
-    bindKey: 'Alt-r',
-    exec: function(iSearch) {
-        iSearch.convertNeedleToRegExp();
-    }
-}].map(function(cmd) {
-    cmd.readOnly = true;
-    cmd.isIncrementalSearchCommand = true;
-    cmd.scrollIntoView = "animate-cursor";
-    return cmd;
-});
+    exec: function(iSearch) { iSearch.$editor.execCommand('recenterTopBottom'); },
+    readOnly: true,
+    isIncrementalSearchCommand: true
+}];

 function IncrementalSearchKeyboardHandler(iSearch) {
    this.$iSearch = iSearch;
@ -169,7 +170,7 @@ function IncrementalSearchKeyboardHandler(iSearch) {

 oop.inherits(IncrementalSearchKeyboardHandler, HashHandler);

-(function() {
+;(function() {

    this.attach = function(editor) {
        var iSearch = this.$iSearch;
@ -178,19 +179,15 @@ oop.inherits(IncrementalSearchKeyboardHandler, HashHandler);
            if (!e.command.isIncrementalSearchCommand) return undefined;
            e.stopPropagation();
            e.preventDefault();
-            var scrollTop = editor.session.getScrollTop();
-            var result = e.command.exec(iSearch, e.args || {});
-            editor.renderer.scrollCursorIntoView(null, 0.5);
-            editor.renderer.animateScrolling(scrollTop);
-            return result;
+            return e.command.exec(iSearch, e.args || {});
        });
-    };
+    }

    this.detach = function(editor) {
        if (!this.$commandExecHandler) return;
        editor.commands.removeEventListener('exec', this.$commandExecHandler);
        delete this.$commandExecHandler;
-    };
+    }

    var handleKeyboard$super = this.handleKeyboard;
    this.handleKeyboard = function(data, hashId, key, keyCode) {
@ -203,7 +200,7 @@ oop.inherits(IncrementalSearchKeyboardHandler, HashHandler);
            if (extendCmd) { return {command: extendCmd, args: key}; }
        }
        return {command: "null", passEvent: hashId == 0 || hashId == 4};
-    };
+    }

 }).call(IncrementalSearchKeyboardHandler.prototype);

--- a/lib/ace/commands/multi_select_commands.js
+++ b/lib/ace/commands/multi_select_commands.js
@ -35,49 +35,41 @@ exports.defaultCommands = [{
    name: "addCursorAbove",
    exec: function(editor) { editor.selectMoreLines(-1); },
    bindKey: {win: "Ctrl-Alt-Up", mac: "Ctrl-Alt-Up"},
-    scrollIntoView: "cursor",
    readonly: true
 }, {
    name: "addCursorBelow",
    exec: function(editor) { editor.selectMoreLines(1); },
    bindKey: {win: "Ctrl-Alt-Down", mac: "Ctrl-Alt-Down"},
-    scrollIntoView: "cursor",
    readonly: true
 }, {
    name: "addCursorAboveSkipCurrent",
    exec: function(editor) { editor.selectMoreLines(-1, true); },
    bindKey: {win: "Ctrl-Alt-Shift-Up", mac: "Ctrl-Alt-Shift-Up"},
-    scrollIntoView: "cursor",
    readonly: true
 }, {
    name: "addCursorBelowSkipCurrent",
    exec: function(editor) { editor.selectMoreLines(1, true); },
    bindKey: {win: "Ctrl-Alt-Shift-Down", mac: "Ctrl-Alt-Shift-Down"},
-    scrollIntoView: "cursor",
    readonly: true
 }, {
    name: "selectMoreBefore",
    exec: function(editor) { editor.selectMore(-1); },
    bindKey: {win: "Ctrl-Alt-Left", mac: "Ctrl-Alt-Left"},
-    scrollIntoView: "cursor",
    readonly: true
 }, {
    name: "selectMoreAfter",
    exec: function(editor) { editor.selectMore(1); },
    bindKey: {win: "Ctrl-Alt-Right", mac: "Ctrl-Alt-Right"},
-    scrollIntoView: "cursor",
    readonly: true
 }, {
    name: "selectNextBefore",
    exec: function(editor) { editor.selectMore(-1, true); },
    bindKey: {win: "Ctrl-Alt-Shift-Left", mac: "Ctrl-Alt-Shift-Left"},
-    scrollIntoView: "cursor",
    readonly: true
 }, {
    name: "selectNextAfter",
    exec: function(editor) { editor.selectMore(1, true); },
    bindKey: {win: "Ctrl-Alt-Shift-Right", mac: "Ctrl-Alt-Shift-Right"},
-    scrollIntoView: "cursor",
    readonly: true
 }, {
    name: "splitIntoLines",
@ -87,13 +79,11 @@ exports.defaultCommands = [{
 }, {
    name: "alignCursors",
    exec: function(editor) { editor.alignCursors(); },
-    bindKey: {win: "Ctrl-Alt-A", mac: "Ctrl-Alt-A"},
-    scrollIntoView: "cursor"
+    bindKey: {win: "Ctrl-Alt-A", mac: "Ctrl-Alt-A"}
 }, {
    name: "findAll",
    exec: function(editor) { editor.findAll(); },
    bindKey: {win: "Ctrl-Alt-K", mac: "Ctrl-Alt-G"},
-    scrollIntoView: "cursor",
    readonly: true
 }];

@ -102,7 +92,6 @@ exports.multiSelectCommands = [{
    name: "singleSelection",
    bindKey: "esc",
    exec: function(editor) { editor.exitMultiSelectMode(); },
-    scrollIntoView: "cursor",
    readonly: true,
    isAvailable: function(editor) {return editor && editor.inMultiSelectMode}
 }];
--- a/lib/ace/config.js
+++ b/lib/ace/config.js
@ -34,12 +34,10 @@ define(function(require, exports, module) {
 var lang = require("./lib/lang");
 var oop = require("./lib/oop");
 var net = require("./lib/net");
-var AppConfig = require("./lib/app_config").AppConfig;
-
-module.exports = exports = new AppConfig();
+var EventEmitter = require("./lib/event_emitter").EventEmitter;

 var global = (function() {
-    return this || typeof window != "undefined" && window;
+    return this;
 })();

 var options = {
@ -71,6 +69,8 @@ exports.all = function() {
 };

 // module loading
+oop.implement(exports, EventEmitter);
+
 exports.moduleUrl = function(name, component) {
    if (options.$moduleUrls[name])
        return options.$moduleUrls[name];
@ -142,6 +142,7 @@ exports.loadModule = function(moduleName, onLoad) {
    net.loadScript(exports.moduleUrl(moduleName, moduleType), afterLoad);
 };

+
 // initialization
 function init(packaged) {
    options.packaged = packaged || require.packaged || module.packaged || (global.define && define.packaged);
@ -199,4 +200,102 @@ function deHyphenate(str) {
    return str.replace(/-(.)/g, function(m, m1) { return m1.toUpperCase(); });
 }

+var optionsProvider = {
+    setOptions: function(optList) {
+        Object.keys(optList).forEach(function(key) {
+            this.setOption(key, optList[key]);
+        }, this);
+    },
+    getOptions: function(optionNames) {
+        var result = {};
+        if (!optionNames) {
+            optionNames = Object.keys(this.$options);
+        } else if (!Array.isArray(optionNames)) {
+            result = optionNames;
+            optionNames = Object.keys(result);
+        }
+        optionNames.forEach(function(key) {
+            result[key] = this.getOption(key);
+        }, this);
+        return result;
+    },
+    setOption: function(name, value) {
+        if (this["$" + name] === value)
+            return;
+        var opt = this.$options[name];
+        if (!opt) {
+            if (typeof console != "undefined" && console.warn)
+                console.warn('misspelled option "' + name + '"');
+            return undefined;
+        }
+        if (opt.forwardTo)
+            return this[opt.forwardTo] && this[opt.forwardTo].setOption(name, value);
+
+        if (!opt.handlesSet)
+            this["$" + name] = value;
+        if (opt && opt.set)
+            opt.set.call(this, value);
+    },
+    getOption: function(name) {
+        var opt = this.$options[name];
+        if (!opt) {
+            if (typeof console != "undefined" && console.warn)
+                console.warn('misspelled option "' + name + '"');
+            return undefined;
+        }
+        if (opt.forwardTo)
+            return this[opt.forwardTo] && this[opt.forwardTo].getOption(name);
+        return opt && opt.get ? opt.get.call(this) : this["$" + name];
+    }
+};
+
+var defaultOptions = {};
+/*
+ * option {name, value, initialValue, setterName, set, get }
+ */
+exports.defineOptions = function(obj, path, options) {
+    if (!obj.$options)
+        defaultOptions[path] = obj.$options = {};
+
+    Object.keys(options).forEach(function(key) {
+        var opt = options[key];
+        if (typeof opt == "string")
+            opt = {forwardTo: opt};
+
+        opt.name || (opt.name = key);
+        obj.$options[opt.name] = opt;
+        if ("initialValue" in opt)
+            obj["$" + opt.name] = opt.initialValue;
+    });
+
+    // implement option provider interface
+    oop.implement(obj, optionsProvider);
+
+    return this;
+};
+
+exports.resetOptions = function(obj) {
+    Object.keys(obj.$options).forEach(function(key) {
+        var opt = obj.$options[key];
+        if ("value" in opt)
+            obj.setOption(key, opt.value);
+    });
+};
+
+exports.setDefaultValue = function(path, name, value) {
+    var opts = defaultOptions[path] || (defaultOptions[path] = {});
+    if (opts[name]) {
+        if (opts.forwardTo)
+            exports.setDefaultValue(opts.forwardTo, name, value);
+        else
+            opts[name].value = value;
+    }
+};
+
+exports.setDefaultValues = function(path, optionHash) {
+    Object.keys(optionHash).forEach(function(key) {
+        exports.setDefaultValue(path, key, optionHash[key]);
+    });
+};
+
 });
--- a/lib/ace/config_test.js
+++ b/lib/ace/config_test.js
@ -117,19 +117,12 @@ module.exports = {
        assert.equal(o.getOption("initialValue"), 8);
        o.setOption("initialValue", 7);
        assert.equal(o.getOption("opt2"), 7);
-        
-        config.setDefaultValues("test_object", {
-            opt1: 1,
-            forwarded: 2
-        });
-        config.resetOptions(o);
-        assert.equal(o.getOption("opt1"), 1);
-        assert.equal(o.getOption("forwarded"), 2);
+
    }
 };

 });

 if (typeof module !== "undefined" && module === require.main) {
-    require("asyncjs").test.testcase(module.exports).exec();
+    require("asyncjs").test.testcase(module.exports).exec()
 }
--- a/lib/ace/css/editor.css
+++ b/lib/ace/css/editor.css
@ -160,8 +160,6 @@
    z-index: 1;
    position: absolute;
    overflow: hidden;
-    /* workaround for chrome bug https://github.com/ajaxorg/ace/issues/2312*/
-    word-wrap: normal;
    white-space: pre;
    height: 100%;
    width: 100%;
@ -422,30 +420,3 @@
    position: absolute;
    z-index: 8;
 }
-
-/*
-styles = []
-for (var i = 1; i < 16; i++) {
-    styles.push(".ace_br" + i + "{" + (
-        ["top-left", "top-right", "bottom-right", "bottom-left"]
-    ).map(function(x, j) {
-        return i & (1<<j) ? "border-" + x + "-radius: 3px;" : "" 
-    }).filter(Boolean).join(" ") + "}")
-}
-styles.join("\n")
-*/
-.ace_br1 {border-top-left-radius    : 3px;}
-.ace_br2 {border-top-right-radius   : 3px;}
-.ace_br3 {border-top-left-radius    : 3px; border-top-right-radius:    3px;}
-.ace_br4 {border-bottom-right-radius: 3px;}
-.ace_br5 {border-top-left-radius    : 3px; border-bottom-right-radius: 3px;}
-.ace_br6 {border-top-right-radius   : 3px; border-bottom-right-radius: 3px;}
-.ace_br7 {border-top-left-radius    : 3px; border-top-right-radius:    3px; border-bottom-right-radius: 3px;}
-.ace_br8 {border-bottom-left-radius : 3px;}
-.ace_br9 {border-top-left-radius    : 3px; border-bottom-left-radius:  3px;}
-.ace_br10{border-top-right-radius   : 3px; border-bottom-left-radius:  3px;}
-.ace_br11{border-top-left-radius    : 3px; border-top-right-radius:    3px; border-bottom-left-radius:  3px;}
-.ace_br12{border-bottom-right-radius: 3px; border-bottom-left-radius:  3px;}
-.ace_br13{border-top-left-radius    : 3px; border-bottom-right-radius: 3px; border-bottom-left-radius:  3px;}
-.ace_br14{border-top-right-radius   : 3px; border-bottom-right-radius: 3px; border-bottom-left-radius:  3px;}
-.ace_br15{border-top-left-radius    : 3px; border-top-right-radius:    3px; border-bottom-right-radius: 3px; border-bottom-left-radius: 3px;}
--- a/lib/ace/document.js
+++ b/lib/ace/document.js
@ -32,36 +32,36 @@ define(function(require, exports, module) {
 "use strict";

 var oop = require("./lib/oop");
-var applyDelta = require("./apply_delta").applyDelta;
 var EventEmitter = require("./lib/event_emitter").EventEmitter;
 var Range = require("./range").Range;
 var Anchor = require("./anchor").Anchor;

 /**
 * Contains the text of the document. Document can be attached to several [[EditSession `EditSession`]]s. 
+ *
 * At its core, `Document`s are just an array of strings, with each row in the document matching up to the array index.
 *
 * @class Document
 **/

-/**
+ /**
 *
 * Creates a new `Document`. If `text` is included, the `Document` contains those strings; otherwise, it's empty.
 * @param {String | Array} text The starting text
 * @constructor
 **/

-var Document = function(textOrLines) {
-    this.$lines = [""];
+var Document = function(text) {
+    this.$lines = [];

    // There has to be one line at least in the document. If you pass an empty
    // string to the insert function, nothing will happen. Workaround.
-    if (textOrLines.length === 0) {
+    if (text.length === 0) {
        this.$lines = [""];
-    } else if (Array.isArray(textOrLines)) {
-        this.insertMergedLines({row: 0, column: 0}, textOrLines);
+    } else if (Array.isArray(text)) {
+        this._insertLines(0, text);
    } else {
-        this.insert({row: 0, column:0}, textOrLines);
+        this.insert({row: 0, column:0}, text);
    }
 };

@ -75,9 +75,9 @@ var Document = function(textOrLines) {
    * @param {String} text The text to use
    **/
    this.setValue = function(text) {
-        var len = this.getLength() - 1;
-        this.remove(new Range(0, 0, len, this.getLine(len).length));
-        this.insert({row: 0, column: 0}, text);
+        var len = this.getLength();
+        this.remove(new Range(0, 0, len, this.getLine(len-1).length));
+        this.insert({row: 0, column:0}, text);
    };

    /**
@ -98,7 +98,7 @@ var Document = function(textOrLines) {
    };

    /** 
-    * Splits a string of text on any newline (`\n`) or carriage-return (`\r`) characters.
+    * Splits a string of text on any newline (`\n`) or carriage-return ('\r') characters.
    *
    * @method $split
    * @param {String} text The text to work with
@ -107,15 +107,14 @@ var Document = function(textOrLines) {
    **/

    // check for IE split bug
-    if ("aaa".split(/a/).length === 0) {
+    if ("aaa".split(/a/).length === 0)
        this.$split = function(text) {
            return text.replace(/\r\n|\r/g, "\n").split("\n");
        };
-    } else {
+    else
        this.$split = function(text) {
            return text.split(/\r\n|\r|\n/);
        };
-    }


    this.$detectNewLine = function(text) {
@ -208,49 +207,32 @@ var Document = function(textOrLines) {
    };

    /**
-    * Returns all the text within `range` as a single string.
-    * @param {Range} range The range to work with.
+    * [Given a range within the document, this function returns all the text within that range as a single string.]{: #Document.getTextRange.desc}
+    * @param {Range} range The range to work with
    * 
    * @returns {String}
    **/
    this.getTextRange = function(range) {
-        return this.getLinesForRange(range).join(this.getNewLineCharacter());
-    };
-    
-    /**
-    * Returns all the text within `range` as an array of lines.
-    * @param {Range} range The range to work with.
-    * 
-    * @returns {Array}
-    **/
-    this.getLinesForRange = function(range) {
-        var lines;
-        if (range.start.row === range.end.row) {
-            // Handle a single-line range.
-            lines = [this.getLine(range.start.row).substring(range.start.column, range.end.column)];
-        } else {
-            // Handle a multi-line range.
-            lines = this.getLines(range.start.row, range.end.row);
-            lines[0] = (lines[0] || "").substring(range.start.column);
-            var l = lines.length - 1;
-            if (range.end.row - range.start.row == l)
-                lines[l] = lines[l].substring(0, range.end.column);
+        if (range.start.row == range.end.row) {
+            return this.getLine(range.start.row)
+                .substring(range.start.column, range.end.column);
        }
-        return lines;
+        var lines = this.getLines(range.start.row, range.end.row);
+        lines[0] = (lines[0] || "").substring(range.start.column);
+        var l = lines.length - 1;
+        if (range.end.row - range.start.row == l)
+            lines[l] = lines[l].substring(0, range.end.column);
+        return lines.join(this.getNewLineCharacter());
    };

-    // Deprecated methods retained for backwards compatibility.
-    this.insertLines = function(row, lines) {
-        console.warn("Use of document.insertLines is deprecated. Use the insertFullLines method instead.");
-        return this.insertFullLines(row, lines);
-    };
-    this.removeLines = function(firstRow, lastRow) {
-        console.warn("Use of document.removeLines is deprecated. Use the removeFullLines method instead.");
-        return this.removeFullLines(firstRow, lastRow);
-    };
-    this.insertNewLine = function(position) {
-        console.warn("Use of document.insertNewLine is deprecated. Use insertMergedLines(position, [\'\', \'\']) instead.");
-        return this.insertMergedLines(position, ["", ""]);
+    this.$clipPosition = function(position) {
+        var length = this.getLength();
+        if (position.row >= length) {
+            position.row = Math.max(0, length - 1);
+            position.column = this.getLine(length-1).length;
+        } else if (position.row < 0)
+            position.row = 0;
+        return position;
    };

    /**
@ -261,160 +243,159 @@ var Document = function(textOrLines) {
    *
    **/
    this.insert = function(position, text) {
-        // Only detect new lines if the document has no line break yet.
+        if (!text || text.length === 0)
+            return position;
+
+        position = this.$clipPosition(position);
+
+        // only detect new lines if the document has no line break yet
        if (this.getLength() <= 1)
            this.$detectNewLine(text);
-        
-        return this.insertMergedLines(position, this.$split(text));
+
+        var lines = this.$split(text);
+        var firstLine = lines.splice(0, 1)[0];
+        var lastLine = lines.length == 0 ? null : lines.splice(lines.length - 1, 1)[0];
+
+        position = this.insertInLine(position, firstLine);
+        if (lastLine !== null) {
+            position = this.insertNewLine(position); // terminate first line
+            position = this._insertLines(position.row, lines);
+            position = this.insertInLine(position, lastLine || "");
+        }
+        return position;
    };
-    
+
    /**
-    * Inserts `text` into the `position` at the current row. This method also triggers the `"change"` event.
-    * 
-    * This differs from the `insert` method in two ways:
-    *   1. This does NOT handle newline characters (single-line text only).
-    *   2. This is faster than the `insert` method for single-line text insertions.
-    * 
+     * Fires whenever the document changes.
+     *
+     * Several methods trigger different `"change"` events. Below is a list of each action type, followed by each property that's also available:
+     *
+     *  * `"insertLines"` (emitted by [[Document.insertLines]])
+     *    * `range`: the [[Range]] of the change within the document
+     *    * `lines`: the lines in the document that are changing
+     *  * `"insertText"` (emitted by [[Document.insertNewLine]])
+     *    * `range`: the [[Range]] of the change within the document
+     *    * `text`: the text that's being added
+     *  * `"removeLines"` (emitted by [[Document.insertLines]])
+     *    * `range`: the [[Range]] of the change within the document
+     *    * `lines`: the lines in the document that were removed
+     *    * `nl`: the new line character (as defined by [[Document.getNewLineCharacter]])
+     *  * `"removeText"` (emitted by [[Document.removeInLine]] and [[Document.removeNewLine]])
+     *    * `range`: the [[Range]] of the change within the document
+     *    * `text`: the text that's being removed
+     *
+     * @event change
+     * @param {Object} e Contains at least one property called `"action"`. `"action"` indicates the action that triggered the change. Each action also has a set of additional properties.
+     *
+     **/
+    /**
+    * Inserts the elements in `lines` into the document, starting at the row index given by `row`. This method also triggers the `'change'` event.
+    * @param {Number} row The index of the row to insert at
+    * @param {Array} lines An array of strings
+    * @returns {Object} Contains the final row and column, like this:  
+    *   ```
+    *   {row: endRow, column: 0}
+    *   ```  
+    *   If `lines` is empty, this function returns an object containing the current row, and column, like this:  
+    *   ``` 
+    *   {row: row, column: 0}
+    *   ```
+    *
+    **/
+    this.insertLines = function(row, lines) {
+        if (row >= this.getLength())
+            return this.insert({row: row, column: 0}, "\n" + lines.join("\n"));
+        return this._insertLines(Math.max(row, 0), lines);
+    };
+    this._insertLines = function(row, lines) {
+        if (lines.length == 0)
+            return {row: row, column: 0};
+
+        // apply doesn't work for big arrays (smallest threshold is on safari 0xFFFF)
+        // to circumvent that we have to break huge inserts into smaller chunks here
+        while (lines.length > 0xF000) {
+            var end = this._insertLines(row, lines.slice(0, 0xF000));
+            lines = lines.slice(0xF000);
+            row = end.row;
+        }
+
+        var args = [row, 0];
+        args.push.apply(args, lines);
+        this.$lines.splice.apply(this.$lines, args);
+
+        var range = new Range(row, 0, row + lines.length, 0);
+        var delta = {
+            action: "insertLines",
+            range: range,
+            lines: lines
+        };
+        this._signal("change", { data: delta });
+        return range.end;
+    };
+
+    /**
+    * Inserts a new line into the document at the current row's `position`. This method also triggers the `'change'` event. 
+    * @param {Object} position The position to insert at
+    * @returns {Object} Returns an object containing the final row and column, like this:<br/>
+    *    ```
+    *    {row: endRow, column: 0}
+    *    ```
+    *
+    **/
+    this.insertNewLine = function(position) {
+        position = this.$clipPosition(position);
+        var line = this.$lines[position.row] || "";
+
+        this.$lines[position.row] = line.substring(0, position.column);
+        this.$lines.splice(position.row + 1, 0, line.substring(position.column, line.length));
+
+        var end = {
+            row : position.row + 1,
+            column : 0
+        };
+
+        var delta = {
+            action: "insertText",
+            range: Range.fromPoints(position, end),
+            text: this.getNewLineCharacter()
+        };
+        this._signal("change", { data: delta });
+
+        return end;
+    };
+
+    /**
+    * Inserts `text` into the `position` at the current row. This method also triggers the `'change'` event.
    * @param {Object} position The position to insert at; it's an object that looks like `{ row: row, column: column}`
    * @param {String} text A chunk of text
    * @returns {Object} Returns an object containing the final row and column, like this:  
    *     ```
    *     {row: endRow, column: 0}
    *     ```
+    *
    **/
    this.insertInLine = function(position, text) {
-        var start = this.clippedPos(position.row, position.column);
-        var end = this.pos(position.row, position.column + text.length);
-        
-        this.applyDelta({
-            start: start,
-            end: end,
-            action: "insert",
-            lines: [text]
-        }, true);
-        
-        return this.clonePos(end);
-    };
-    
-    this.clippedPos = function(row, column) {
-        var length = this.getLength();
-        if (row === undefined) {
-            row = length;
-        } else if (row < 0) {
-            row = 0;
-        } else if (row >= length) {
-            row = length - 1;
-            column = undefined;
-        }
-        var line = this.getLine(row);
-        if (column == undefined)
-            column = line.length;
-        column = Math.min(Math.max(column, 0), line.length);
-        return {row: row, column: column};
-    };
-    
-    this.clonePos = function(pos) {
-        return {row: pos.row, column: pos.column};
-    };
-    
-    this.pos = function(row, column) {
-        return {row: row, column: column};
-    };
-    
-    this.$clipPosition = function(position) {
-        var length = this.getLength();
-        if (position.row >= length) {
-            position.row = Math.max(0, length - 1);
-            position.column = this.getLine(length - 1).length;
-        } else {
-            position.row = Math.max(0, position.row);
-            position.column = Math.min(Math.max(position.column, 0), this.getLine(position.row).length);
-        }
-        return position;
-    };
+        if (text.length == 0)
+            return position;

-    /**
-    * Fires whenever the document changes.
-    *
-    * Several methods trigger different `"change"` events. Below is a list of each action type, followed by each property that's also available:
-    *
-    *  * `"insert"`
-    *    * `range`: the [[Range]] of the change within the document
-    *    * `lines`: the lines being added
-    *  * `"remove"`
-    *    * `range`: the [[Range]] of the change within the document
-    *    * `lines`: the lines being removed
-    *
-    * @event change
-    * @param {Object} e Contains at least one property called `"action"`. `"action"` indicates the action that triggered the change. Each action also has a set of additional properties.
-    *
-    **/
-    
-    /**
-    * Inserts the elements in `lines` into the document as full lines (does not merge with existing line), starting at the row index given by `row`. This method also triggers the `"change"` event.
-    * @param {Number} row The index of the row to insert at
-    * @param {Array} lines An array of strings
-    * @returns {Object} Contains the final row and column, like this:  
-    *   ```
-    *   {row: endRow, column: 0}
-    *   ```  
-    *   If `lines` is empty, this function returns an object containing the current row, and column, like this:  
-    *   ``` 
-    *   {row: row, column: 0}
-    *   ```
-    *
-    **/
-    this.insertFullLines = function(row, lines) {
-        // Clip to document.
-        // Allow one past the document end.
-        row = Math.min(Math.max(row, 0), this.getLength());
-        
-        // Calculate insertion point.
-        var column = 0;
-        if (row < this.getLength()) {
-            // Insert before the specified row.
-            lines = lines.concat([""]);
-            column = 0;
-        } else {
-            // Insert after the last row in the document.
-            lines = [""].concat(lines);
-            row--;
-            column = this.$lines[row].length;
-        }
-        
-        // Insert.
-        this.insertMergedLines({row: row, column: column}, lines);
-    };
+        var line = this.$lines[position.row] || "";
+
+        this.$lines[position.row] = line.substring(0, position.column) + text
+                + line.substring(position.column);

-    /**
-    * Inserts the elements in `lines` into the document, starting at the position index given by `row`. This method also triggers the `"change"` event.
-    * @param {Number} row The index of the row to insert at
-    * @param {Array} lines An array of strings
-    * @returns {Object} Contains the final row and column, like this:  
-    *   ```
-    *   {row: endRow, column: 0}
-    *   ```  
-    *   If `lines` is empty, this function returns an object containing the current row, and column, like this:  
-    *   ``` 
-    *   {row: row, column: 0}
-    *   ```
-    *
-    **/    
-    this.insertMergedLines = function(position, lines) {
-        var start = this.clippedPos(position.row, position.column);
        var end = {
-            row: start.row + lines.length - 1,
-            column: (lines.length == 1 ? start.column : 0) + lines[lines.length - 1].length
+            row : position.row,
+            column : position.column + text.length
        };
-        
-        this.applyDelta({
-            start: start,
-            end: end,
-            action: "insert",
-            lines: lines
-        });
-        
-        return this.clonePos(end);
+
+        var delta = {
+            action: "insertText",
+            range: Range.fromPoints(position, end),
+            text: text
+        };
+        this._signal("change", { data: delta });
+
+        return end;
    };

    /**
@ -424,90 +405,113 @@ var Document = function(textOrLines) {
    *
    **/
    this.remove = function(range) {
-        var start = this.clippedPos(range.start.row, range.start.column);
-        var end = this.clippedPos(range.end.row, range.end.column);
-        this.applyDelta({
-            start: start,
-            end: end,
-            action: "remove",
-            lines: this.getLinesForRange({start: start, end: end})
-        });
-        return this.clonePos(start);
+        if (!(range instanceof Range))
+            range = Range.fromPoints(range.start, range.end);
+        // clip to document
+        range.start = this.$clipPosition(range.start);
+        range.end = this.$clipPosition(range.end);
+
+        if (range.isEmpty())
+            return range.start;
+
+        var firstRow = range.start.row;
+        var lastRow = range.end.row;
+
+        if (range.isMultiLine()) {
+            var firstFullRow = range.start.column == 0 ? firstRow : firstRow + 1;
+            var lastFullRow = lastRow - 1;
+
+            if (range.end.column > 0)
+                this.removeInLine(lastRow, 0, range.end.column);
+
+            if (lastFullRow >= firstFullRow)
+                this._removeLines(firstFullRow, lastFullRow);
+
+            if (firstFullRow != firstRow) {
+                this.removeInLine(firstRow, range.start.column, this.getLine(firstRow).length);
+                this.removeNewLine(range.start.row);
+            }
+        }
+        else {
+            this.removeInLine(firstRow, range.start.column, range.end.column);
+        }
+        return range.start;
    };

    /**
-     * Removes the specified columns from the `row`. This method also triggers a `"change"` event.
-     * @param {Number} row The row to remove from
-     * @param {Number} startColumn The column to start removing at 
-     * @param {Number} endColumn The column to stop removing at
-     * @returns {Object} Returns an object containing `startRow` and `startColumn`, indicating the new row and column values.<br/>If `startColumn` is equal to `endColumn`, this function returns nothing.
-     *
-     **/
+    * Removes the specified columns from the `row`. This method also triggers the `'change'` event.
+    * @param {Number} row The row to remove from
+    * @param {Number} startColumn The column to start removing at 
+    * @param {Number} endColumn The column to stop removing at
+    * @returns {Object} Returns an object containing `startRow` and `startColumn`, indicating the new row and column values.<br/>If `startColumn` is equal to `endColumn`, this function returns nothing.
+    *
+    **/
    this.removeInLine = function(row, startColumn, endColumn) {
-        var start = this.clippedPos(row, startColumn);
-        var end = this.clippedPos(row, endColumn);
-        
-        this.applyDelta({
-            start: start,
-            end: end,
-            action: "remove",
-            lines: this.getLinesForRange({start: start, end: end})
-        }, true);
-        
-        return this.clonePos(start);
+        if (startColumn == endColumn)
+            return;
+
+        var range = new Range(row, startColumn, row, endColumn);
+        var line = this.getLine(row);
+        var removed = line.substring(startColumn, endColumn);
+        var newLine = line.substring(0, startColumn) + line.substring(endColumn, line.length);
+        this.$lines.splice(row, 1, newLine);
+
+        var delta = {
+            action: "removeText",
+            range: range,
+            text: removed
+        };
+        this._signal("change", { data: delta });
+        return range.start;
    };

    /**
-    * Removes a range of full lines. This method also triggers the `"change"` event.
+    * Removes a range of full lines. This method also triggers the `'change'` event.
    * @param {Number} firstRow The first row to be removed
    * @param {Number} lastRow The last row to be removed
    * @returns {[String]} Returns all the removed lines.
    *
    **/
-    this.removeFullLines = function(firstRow, lastRow) {
-        // Clip to document.
-        firstRow = Math.min(Math.max(0, firstRow), this.getLength() - 1);
-        lastRow  = Math.min(Math.max(0, lastRow ), this.getLength() - 1);
-        
-        // Calculate deletion range.
-        // Delete the ending new line unless we're at the end of the document.
-        // If we're at the end of the document, delete the starting new line.
-        var deleteFirstNewLine = lastRow == this.getLength() - 1 && firstRow > 0;
-        var deleteLastNewLine  = lastRow  < this.getLength() - 1;
-        var startRow = ( deleteFirstNewLine ? firstRow - 1                  : firstRow                    );
-        var startCol = ( deleteFirstNewLine ? this.getLine(startRow).length : 0                           );
-        var endRow   = ( deleteLastNewLine  ? lastRow + 1                   : lastRow                     );
-        var endCol   = ( deleteLastNewLine  ? 0                             : this.getLine(endRow).length ); 
-        var range = new Range(startRow, startCol, endRow, endCol);
-        
-        // Store delelted lines with bounding newlines ommitted (maintains previous behavior).
-        var deletedLines = this.$lines.slice(firstRow, lastRow + 1);
-        
-        this.applyDelta({
-            start: range.start,
-            end: range.end,
-            action: "remove",
-            lines: this.getLinesForRange(range)
-        });
-        
-        // Return the deleted lines.
-        return deletedLines;
+    this.removeLines = function(firstRow, lastRow) {
+        if (firstRow < 0 || lastRow >= this.getLength())
+            return this.remove(new Range(firstRow, 0, lastRow + 1, 0));
+        return this._removeLines(firstRow, lastRow);
+    };
+
+    this._removeLines = function(firstRow, lastRow) {
+        var range = new Range(firstRow, 0, lastRow + 1, 0);
+        var removed = this.$lines.splice(firstRow, lastRow - firstRow + 1);
+
+        var delta = {
+            action: "removeLines",
+            range: range,
+            nl: this.getNewLineCharacter(),
+            lines: removed
+        };
+        this._signal("change", { data: delta });
+        return removed;
    };

    /**
-    * Removes the new line between `row` and the row immediately following it. This method also triggers the `"change"` event.
+    * Removes the new line between `row` and the row immediately following it. This method also triggers the `'change'` event.
    * @param {Number} row The row to check
    *
    **/
    this.removeNewLine = function(row) {
-        if (row < this.getLength() - 1 && row >= 0) {
-            this.applyDelta({
-                start: this.pos(row, this.getLine(row).length),
-                end: this.pos(row + 1, 0),
-                action: "remove",
-                lines: ["", ""]
-            });
-        }
+        var firstLine = this.getLine(row);
+        var secondLine = this.getLine(row+1);
+
+        var range = new Range(row, firstLine.length, row+1, 0);
+        var line = firstLine + secondLine;
+
+        this.$lines.splice(row, 2, line);
+
+        var delta = {
+            action: "removeText",
+            range: range,
+            text: this.getNewLineCharacter()
+        };
+        this._signal("change", { data: delta });
    };

    /**
@ -521,9 +525,9 @@ var Document = function(textOrLines) {
    *
    **/
    this.replace = function(range, text) {
-        if (!range instanceof Range)
+        if (!(range instanceof Range))
            range = Range.fromPoints(range.start, range.end);
-        if (text.length === 0 && range.isEmpty())
+        if (text.length == 0 && range.isEmpty())
            return range.start;

        // Shortcut: If the text we want to insert is the same as it is already
@ -532,106 +536,55 @@ var Document = function(textOrLines) {
            return range.end;

        this.remove(range);
-        var end;
        if (text) {
-            end = this.insert(range.start, text);
+            var end = this.insert(range.start, text);
        }
        else {
            end = range.start;
        }
-        
+
        return end;
    };

    /**
-    * Applies all changes in `deltas` to the document.
-    * @param {Array} deltas An array of delta objects (can include "insert" and "remove" actions)
+    * Applies all the changes previously accumulated. These can be either `'insertText'`, `'insertLines'`, `'removeText'`, and `'removeLines'`.
    **/
    this.applyDeltas = function(deltas) {
        for (var i=0; i<deltas.length; i++) {
-            this.applyDelta(deltas[i]);
+            var delta = deltas[i];
+            var range = Range.fromPoints(delta.range.start, delta.range.end);
+
+            if (delta.action == "insertLines")
+                this.insertLines(range.start.row, delta.lines);
+            else if (delta.action == "insertText")
+                this.insert(range.start, delta.text);
+            else if (delta.action == "removeLines")
+                this._removeLines(range.start.row, range.end.row - 1);
+            else if (delta.action == "removeText")
+                this.remove(range);
        }
    };
-    
+
    /**
-    * Reverts all changes in `deltas` from the document.
-    * @param {Array} deltas An array of delta objects (can include "insert" and "remove" actions)
+    * Reverts any changes previously applied. These can be either `'insertText'`, `'insertLines'`, `'removeText'`, and `'removeLines'`.
    **/
    this.revertDeltas = function(deltas) {
        for (var i=deltas.length-1; i>=0; i--) {
-            this.revertDelta(deltas[i]);
+            var delta = deltas[i];
+
+            var range = Range.fromPoints(delta.range.start, delta.range.end);
+
+            if (delta.action == "insertLines")
+                this._removeLines(range.start.row, range.end.row - 1);
+            else if (delta.action == "insertText")
+                this.remove(range);
+            else if (delta.action == "removeLines")
+                this._insertLines(range.start.row, delta.lines);
+            else if (delta.action == "removeText")
+                this.insert(range.start, delta.text);
        }
    };
-    
-    /**
-    * Applies `delta` to the document.
-    * @param {Object} delta A delta object (can include "insert" and "remove" actions)
-    **/
-    this.applyDelta = function(delta, doNotValidate) {
-        var isInsert = delta.action == "insert";
-        // An empty range is a NOOP.
-        if (isInsert ? delta.lines.length <= 1 && !delta.lines[0]
-            : !Range.comparePoints(delta.start, delta.end)) {
-            return;
-        }
-        
-        if (isInsert && delta.lines.length > 20000)
-            this.$splitAndapplyLargeDelta(delta, 20000);
-        
-        // Apply.
-        applyDelta(this.$lines, delta, doNotValidate);
-        this._signal("change", delta);
-    };
-    
-    this.$splitAndapplyLargeDelta = function(delta, MAX) {
-        // Split large insert deltas. This is necessary because:
-        //    1. We need to support splicing delta lines into the document via $lines.splice.apply(...)
-        //    2. fn.apply() doesn't work for a large number of params. The smallest threshold is on chrome 40 ~42000.
-        // we use 20000 to leave some space for actual stack
-        // 
-        // To Do: Ideally we'd be consistent and also split 'delete' deltas. We don't do this now, because delete
-        //        delta handling is too slow. If we make delete delta handling faster we can split all large deltas
-        //        as shown in https://gist.github.com/aldendaniels/8367109#file-document-snippet-js
-        //        If we do this, update validateDelta() to limit the number of lines in a delete delta.
-        var lines = delta.lines;
-        var l = lines.length;
-        var row = delta.start.row; 
-        var column = delta.start.column;
-        var from = 0, to = 0;
-        do {
-            from = to;
-            to += MAX - 1;
-            var chunk = lines.slice(from, to);
-            if (to > l) {
-                // Update remaining delta.
-                delta.lines = chunk;
-                delta.start.row = row + from;
-                delta.start.column = column;
-                break;
-            }
-            chunk.push("");
-            this.applyDelta({
-                start: this.pos(row + from, column),
-                end: this.pos(row + to, column = 0),
-                action: delta.action,
-                lines: chunk
-            }, true);
-        } while(true);
-    };
-    
-    /**
-    * Reverts `delta` from the document.
-    * @param {Object} delta A delta object (can include "insert" and "remove" actions)
-    **/
-    this.revertDelta = function(delta) {
-        this.applyDelta({
-            start: this.clonePos(delta.start),
-            end: this.clonePos(delta.end),
-            action: (delta.action == "insert" ? "remove" : "insert"),
-            lines: delta.lines.slice()
-        });
-    };
-    
+
    /**
     * Converts an index position in a document to a `{row, column}` object.
     *
--- a/lib/ace/document_test.js
+++ b/lib/ace/document_test.js
@ -46,7 +46,7 @@ module.exports = {
        var doc = new Document(["12", "34"]);

        var deltas = [];
-        doc.on("change", function(e) { deltas.push(e); });
+        doc.on("change", function(e) { deltas.push(e.data); });

        doc.insert({row: 0, column: 1}, "juhu");
        assert.equal(doc.getValue(), ["1juhu2", "34"].join("\n"));
@ -63,9 +63,9 @@ module.exports = {
        var doc = new Document(["12", "34"]);

        var deltas = [];
-        doc.on("change", function(e) { deltas.push(e); });
+        doc.on("change", function(e) { deltas.push(e.data); });

-        doc.insertMergedLines({row: 0, column: 1}, ['', '']);
+        doc.insertNewLine({row: 0, column: 1});
        assert.equal(doc.getValue(), ["1", "2", "34"].join("\n"));

        var d = deltas.concat();
@ -80,9 +80,9 @@ module.exports = {
        var doc = new Document(["12", "34"]);

        var deltas = [];
-        doc.on("change", function(e) { deltas.push(e); });
+        doc.on("change", function(e) { deltas.push(e.data); });

-        doc.insertFullLines(0, ["aa", "bb"]);
+        doc.insertLines(0, ["aa", "bb"]);
        assert.equal(doc.getValue(), ["aa", "bb", "12", "34"].join("\n"));

        var d = deltas.concat();
@ -97,9 +97,9 @@ module.exports = {
        var doc = new Document(["12", "34"]);

        var deltas = [];
-        doc.on("change", function(e) { deltas.push(e); });
+        doc.on("change", function(e) { deltas.push(e.data); });

-        doc.insertFullLines(2, ["aa", "bb"]);
+        doc.insertLines(2, ["aa", "bb"]);
        assert.equal(doc.getValue(), ["12", "34", "aa", "bb"].join("\n"));
    },

@ -107,9 +107,9 @@ module.exports = {
        var doc = new Document(["12", "34"]);

        var deltas = [];
-        doc.on("change", function(e) { deltas.push(e); });
+        doc.on("change", function(e) { deltas.push(e.data); });

-        doc.insertFullLines(1, ["aa", "bb"]);
+        doc.insertLines(1, ["aa", "bb"]);
        assert.equal(doc.getValue(), ["12", "aa", "bb", "34"].join("\n"));

        var d = deltas.concat();
@ -124,7 +124,7 @@ module.exports = {
        var doc = new Document(["12", "34"]);

        var deltas = [];
-        doc.on("change", function(e) { deltas.push(e); });
+        doc.on("change", function(e) { deltas.push(e.data); });

        doc.insert({row: 0, column: 0}, "aa\nbb\ncc");
        assert.equal(doc.getValue(), ["aa", "bb", "cc12", "34"].join("\n"));
@ -141,9 +141,9 @@ module.exports = {
        var doc = new Document(["12", "34"]);

        var deltas = [];
-        doc.on("change", function(e) { deltas.push(e); });
+        doc.on("change", function(e) { deltas.push(e.data); });

-        doc.insert({row: 1, column: 2}, "aa\nbb\ncc");
+        doc.insert({row: 2, column: 0}, "aa\nbb\ncc");
        assert.equal(doc.getValue(), ["12", "34aa", "bb", "cc"].join("\n"));

        var d = deltas.concat();
@ -158,7 +158,7 @@ module.exports = {
        var doc = new Document(["12", "34"]);

        var deltas = [];
-        doc.on("change", function(e) { deltas.push(e); });
+        doc.on("change", function(e) { deltas.push(e.data); });

        doc.insert({row: 0, column: 1}, "aa\nbb\ncc");
        assert.equal(doc.getValue(), ["1aa", "bb", "cc2", "34"].join("\n"));
@ -175,7 +175,7 @@ module.exports = {
        var doc = new Document(["1234", "5678"]);

        var deltas = [];
-        doc.on("change", function(e) { deltas.push(e); });
+        doc.on("change", function(e) { deltas.push(e.data); });

        doc.remove(new Range(0, 1, 0, 3));
        assert.equal(doc.getValue(), ["14", "5678"].join("\n"));
@ -192,7 +192,7 @@ module.exports = {
        var doc = new Document(["1234", "5678"]);

        var deltas = [];
-        doc.on("change", function(e) { deltas.push(e); });
+        doc.on("change", function(e) { deltas.push(e.data); });

        doc.remove(new Range(0, 4, 1, 0));
        assert.equal(doc.getValue(), ["12345678"].join("\n"));
@ -209,7 +209,7 @@ module.exports = {
        var doc = new Document(["1234", "5678", "abcd"]);

        var deltas = [];
-        doc.on("change", function(e) { deltas.push(e); });
+        doc.on("change", function(e) { deltas.push(e.data); });

        doc.remove(new Range(0, 2, 2, 2));
        assert.equal(doc.getValue(), ["12cd"].join("\n"));
@ -226,7 +226,7 @@ module.exports = {
        var doc = new Document(["1234", "5678", "abcd"]);

        var deltas = [];
-        doc.on("change", function(e) { deltas.push(e); });
+        doc.on("change", function(e) { deltas.push(e.data); });

        doc.remove(new Range(1, 0, 3, 0));
        assert.equal(doc.getValue(), ["1234", ""].join("\n"));
@ -235,7 +235,7 @@ module.exports = {
    "test: remove lines should return the removed lines" : function() {
        var doc = new Document(["1234", "5678", "abcd"]);

-        var removed = doc.removeFullLines(1, 2);
+        var removed = doc.removeLines(1, 2);
        assert.equal(removed.join("\n"), ["5678", "abcd"].join("\n"));
    },

@ -296,35 +296,6 @@ module.exports = {
    "test: empty document has to contain one line": function() {
        var doc = new Document("");
        assert.equal(doc.$lines.length, 1);
-    },
-    
-    "test: ignore empty delta": function() {
-        var doc = new Document("");
-        doc.on("change", function() {
-            throw "should ignore empty delta";
-        })
-        doc.insert({row: 0, column: 0}, "");
-        doc.insert({row: 1, column: 1}, "");
-        doc.remove({start: {row: 1, column: 1}, end: {row: 1, column: 1}});
-    },
-    
-    "test: inserting huge delta": function() {
-        var doc = new Document("");
-        var val = "";
-        var MAX = 0xF000;
-        for (var i = 0; i < 10 * MAX; i++) {
-            val += i + "\n"
-        }
-        doc.setValue(val);
-        assert.equal(doc.getValue(), val);
-        
-        for (var i = 3 * MAX + 2; i >= 3 * MAX - 2; i--) {
-            val = doc.getLines(0, i).join("\n");
-            doc.setValue("\nab");
-            assert.equal(doc.getValue(), "\nab");
-            doc.insert({row: 1, column: 1}, val);
-            assert.equal(doc.getValue(), "\na" + val + "b");
-        }
    }
 };

--- a/lib/ace/edit_session.js
+++ b/lib/ace/edit_session.js
@ -151,7 +151,7 @@ var EditSession = function(text, mode) {
    this.$foldData = [];
    this.$foldData.toString = function() {
        return this.join("\n");
-    };
+    }
    this.on("changeFold", this.onChangeFold.bind(this));
    this.$onChange = this.onChange.bind(this);

@ -249,12 +249,13 @@ var EditSession = function(text, mode) {
        this.$resetRowCache(fold.start.row);
    };

-    this.onChange = function(delta) {
+    this.onChange = function(e) {
+        var delta = e.data;
        this.$modified = true;

-        this.$resetRowCache(delta.start.row);
+        this.$resetRowCache(delta.range.start.row);

-        var removedFolds = this.$updateInternalDataOnChange(delta);
+        var removedFolds = this.$updateInternalDataOnChange(e);
        if (!this.$fromUndo && this.$undoManager && !delta.ignore) {
            this.$deltasDoc.push(delta);
            if (removedFolds && removedFolds.length != 0) {
@ -268,7 +269,7 @@ var EditSession = function(text, mode) {
        }

        this.bgTokenizer && this.bgTokenizer.$updateOnChange(delta);
-        this._signal("change", delta);
+        this._signal("change", e);
    };

    /**
@ -678,10 +679,10 @@ var EditSession = function(text, mode) {
    };

    /**
-    * Returns an object containing all of the markers, either front or back.
+    * Returns an array containing the IDs of all the markers, either front or back.
    * @param {Boolean} inFront If `true`, indicates you only want front markers; `false` indicates only back markers
    *
-    * @returns {Object}
+    * @returns {Array}
    **/
    this.getMarkers = function(inFront) {
        return inFront ? this.$frontMarkers : this.$backMarkers;
@ -892,17 +893,17 @@ var EditSession = function(text, mode) {
        config.loadModule(["mode", path], function(m) {
            if (this.$modeId !== path)
                return cb && cb();
-            if (this.$modes[path] && !options) {
-                this.$onChangeMode(this.$modes[path]);
-            } else if (m && m.Mode) {
+            if (this.$modes[path] && !options)
+                return this.$onChangeMode(this.$modes[path]);
+            if (m && m.Mode) {
                m = new m.Mode(options);
                if (!options) {
                    this.$modes[path] = m;
                    m.$id = path;
                }
                this.$onChangeMode(m);
+                cb && cb();
            }
-            cb && cb();
        }.bind(this));

        // set mode to text until loading is finished
@ -968,7 +969,10 @@ var EditSession = function(text, mode) {
        try {
            this.$worker = this.$mode.createWorker(this);
        } catch (e) {
-            config.warn("Could not load worker", e);
+            if (typeof console == "object") {
+                console.log("Could not load worker");
+                console.log(e);
+            }    
            this.$worker = null;
        }
    };
@ -1145,19 +1149,6 @@ var EditSession = function(text, mode) {
    this.remove = function(range) {
        return this.doc.remove(range);
    };
-    
-    /**
-    * Removes a range of full lines. This method also triggers the `'change'` event.
-    * @param {Number} firstRow The first row to be removed
-    * @param {Number} lastRow The last row to be removed
-    * @returns {[String]} Returns all the removed lines.
-    *
-    * @related Document.removeFullLines
-    *
-    **/
-    this.removeFullLines = function(firstRow, lastRow){
-        return this.doc.removeFullLines(firstRow, lastRow);
-    };

    /**
     * Reverts previous changes to your document.
@ -1234,36 +1225,39 @@ var EditSession = function(text, mode) {

    this.$getUndoSelection = function(deltas, isUndo, lastUndoRange) {
        function isInsert(delta) {
-            return isUndo ? delta.action !== "insert" : delta.action === "insert";
+            var insert =
+                delta.action === "insertText" || delta.action === "insertLines";
+            return isUndo ? !insert : insert;
        }

        var delta = deltas[0];
        var range, point;
        var lastDeltaIsInsert = false;
        if (isInsert(delta)) {
-            range = Range.fromPoints(delta.start, delta.end);
+            range = Range.fromPoints(delta.range.start, delta.range.end);
            lastDeltaIsInsert = true;
        } else {
-            range = Range.fromPoints(delta.start, delta.start);
+            range = Range.fromPoints(delta.range.start, delta.range.start);
            lastDeltaIsInsert = false;
        }

        for (var i = 1; i < deltas.length; i++) {
            delta = deltas[i];
            if (isInsert(delta)) {
-                point = delta.start;
+                point = delta.range.start;
                if (range.compare(point.row, point.column) == -1) {
-                    range.setStart(point);
+                    range.setStart(delta.range.start);
                }
-                point = delta.end;
+                point = delta.range.end;
                if (range.compare(point.row, point.column) == 1) {
-                    range.setEnd(point);
+                    range.setEnd(delta.range.end);
                }
                lastDeltaIsInsert = true;
            } else {
-                point = delta.start;
+                point = delta.range.start;
                if (range.compare(point.row, point.column) == -1) {
-                    range = Range.fromPoints(delta.start, delta.start);
+                    range =
+                        Range.fromPoints(delta.range.start, delta.range.start);
                }
                lastDeltaIsInsert = false;
            }
@ -1377,7 +1371,7 @@ var EditSession = function(text, mode) {
    this.indentRows = function(startRow, endRow, indentString) {
        indentString = indentString.replace(/\t/g, this.getTabString());
        for (var row=startRow; row<=endRow; row++)
-            this.doc.insertInLine({row: row, column: 0}, indentString);
+            this.insert({row: row, column:0}, indentString);
    };

    /**
@ -1434,11 +1428,11 @@ var EditSession = function(text, mode) {
            x.end.row += diff;
            return x;
        });
-        
+
        var lines = dir == 0
            ? this.doc.getLines(firstRow, lastRow)
-            : this.doc.removeFullLines(firstRow, lastRow);
-        this.doc.insertFullLines(firstRow+diff, lines);
+            : this.doc.removeLines(firstRow, lastRow);
+        this.doc.insertLines(firstRow+diff, lines);
        folds.length && this.addFolds(folds);
        return diff;
    };
@ -1448,6 +1442,8 @@ var EditSession = function(text, mode) {
    * @param {Number} lastRow The final row to move up
    * @returns {Number} If `firstRow` is less-than or equal to 0, this function returns 0. Otherwise, on success, it returns -1.
    *
+    * @related Document.insertLines
+    *
    **/
    this.moveLinesUp = function(firstRow, lastRow) {
        return this.$moveLines(firstRow, lastRow, -1);
@ -1458,6 +1454,8 @@ var EditSession = function(text, mode) {
    * @param {Number} firstRow The starting row to move down
    * @param {Number} lastRow The final row to move down
    * @returns {Number} If `firstRow` is less-than or equal to 0, this function returns 0. Otherwise, on success, it returns -1.
+    *
+    * @related Document.insertLines
    **/
    this.moveLinesDown = function(firstRow, lastRow) {
        return this.$moveLines(firstRow, lastRow, 1);
@ -1585,11 +1583,13 @@ var EditSession = function(text, mode) {
    **/
    this.setWrapLimitRange = function(min, max) {
        if (this.$wrapLimitRange.min !== min || this.$wrapLimitRange.max !== max) {
-            this.$wrapLimitRange = { min: min, max: max };
+            this.$wrapLimitRange = {
+                min: min,
+                max: max
+            };
            this.$modified = true;
            // This will force a recalculation of the wrap limit
-            if (this.$useWrapMode)
-                this._signal("changeWrapMode");
+            this._signal("changeWrapMode");
        }
    };

@ -1661,23 +1661,34 @@ var EditSession = function(text, mode) {
        };
    };

-    this.$updateInternalDataOnChange = function(delta) {
+    this.$updateInternalDataOnChange = function(e) {
        var useWrapMode = this.$useWrapMode;
-        var action = delta.action;
-        var start = delta.start;
-        var end = delta.end;
-        var firstRow = start.row;
-        var lastRow = end.row;
-        var len = lastRow - firstRow;
+        var len;
+        var action = e.data.action;
+        var firstRow = e.data.range.start.row;
+        var lastRow = e.data.range.end.row;
+        var start = e.data.range.start;
+        var end = e.data.range.end;
        var removedFolds = null;
-        
+
+        if (action.indexOf("Lines") != -1) {
+            if (action == "insertLines") {
+                lastRow = firstRow + (e.data.lines.length);
+            } else {
+                lastRow = firstRow;
+            }
+            len = e.data.lines ? e.data.lines.length : lastRow - firstRow;
+        } else {
+            len = lastRow - firstRow;
+        }
+
        this.$updating = true;
        if (len != 0) {
-            if (action === "remove") {
+            if (action.indexOf("remove") != -1) {
                this[useWrapMode ? "$wrapData" : "$rowLengthCache"].splice(firstRow, len);

                var foldLines = this.$foldData;
-                removedFolds = this.getFoldsInRange(delta);
+                removedFolds = this.getFoldsInRange(e.data.range);
                this.removeFolds(removedFolds);

                var foldLine = this.getFoldLine(end.row);
@ -1742,10 +1753,10 @@ var EditSession = function(text, mode) {
        } else {
            // Realign folds. E.g. if you add some new chars before a fold, the
            // fold should "move" to the right.
-            len = Math.abs(delta.start.column - delta.end.column);
-            if (action === "remove") {
+            len = Math.abs(e.data.range.start.column - e.data.range.end.column);
+            if (action.indexOf("remove") != -1) {
                // Get all the folds in the change range and remove them.
-                removedFolds = this.getFoldsInRange(delta);
+                removedFolds = this.getFoldsInRange(e.data.range);
                this.removeFolds(removedFolds);

                len = -len;
@ -1829,7 +1840,7 @@ var EditSession = function(text, mode) {
        TAB_SPACE = 12;


-    this.$computeWrapSplits = function(tokens, wrapLimit, tabSize) {
+    this.$computeWrapSplits = function(tokens, wrapLimit) {
        if (tokens.length == 0) {
            return [];
        }
@ -1840,31 +1851,6 @@ var EditSession = function(text, mode) {

        var isCode = this.$wrapAsCode;

-        var indentedSoftWrap = this.$indentedSoftWrap;
-        var maxIndent = wrapLimit <= Math.max(2 * tabSize, 8)
-            || indentedSoftWrap === false ? 0 : Math.floor(wrapLimit / 2);
-
-        function getWrapIndent() {
-            var indentation = 0;
-            if (maxIndent === 0)
-                return indentation;
-            if (indentedSoftWrap) {
-                for (var i = 0; i < tokens.length; i++) {
-                    var token = tokens[i];
-                    if (token == SPACE)
-                        indentation += 1;
-                    else if (token == TAB)
-                        indentation += tabSize;
-                    else if (token == TAB_SPACE)
-                        continue;
-                    else
-                        break;
-                }
-            }
-            if (isCode && indentedSoftWrap !== false)
-                indentation += tabSize;
-            return Math.min(indentation, maxIndent);
-        }
        function addSplit(screenPos) {
            var displayed = tokens.slice(lastSplit, screenPos);

@ -1881,18 +1867,14 @@ var EditSession = function(text, mode) {
                    len -= 1;
                });

-            if (!splits.length) {
-                indent = getWrapIndent();
-                splits.indent = indent;
-            }
            lastDocSplit += len;
            splits.push(lastDocSplit);
            lastSplit = screenPos;
        }
-        var indent = 0;
-        while (displayLength - lastSplit > wrapLimit - indent) {
+
+        while (displayLength - lastSplit > wrapLimit) {
            // This is, where the split should be.
-            var split = lastSplit + wrapLimit - indent;
+            var split = lastSplit + wrapLimit;

            // If there is a space or tab at this split position, then making
            // a split is simple.
@ -1952,7 +1934,7 @@ var EditSession = function(text, mode) {

            // === ELSE ===
            // Search for the first non space/tab/placeholder/punctuation token backwards.
-            var minSplit = Math.max(split - (wrapLimit -(wrapLimit>>2)), lastSplit - 1);
+            var minSplit = Math.max(split - (isCode ? 10 : wrapLimit-(wrapLimit>>2)), lastSplit - 1);
            while (split > minSplit && tokens[split] < PLACEHOLDER_START) {
                split --;
            }
@ -1980,7 +1962,7 @@ var EditSession = function(text, mode) {
            // around -> force a split.
            if (tokens[split] == CHAR_EXT)
                split--;
-            addSplit(split - indent);
+            addSplit(split);
        }
        return splits;
    };
@ -2087,16 +2069,6 @@ var EditSession = function(text, mode) {
        }
    };

-    this.getRowWrapIndent = function(screenRow) {
-        if (this.$useWrapMode) {
-            var pos = this.screenToDocumentPosition(screenRow, Number.MAX_VALUE);
-            var splits = this.$wrapData[pos.row];
-            return splits.length && splits[0] < pos.column ? splits.indent : 0;
-        } else {
-            return 0;
-        }
-    }
-
    /**
     * Returns the position (on screen) for the last character in the provided screen row.
     * @param {Number} screenRow The screen row to check
@ -2234,21 +2206,20 @@ var EditSession = function(text, mode) {
            line = this.getLine(docRow);
            foldLine = null;
        }
-        var wrapIndent = 0;
+
        if (this.$useWrapMode) {
            var splits = this.$wrapData[docRow];
            if (splits) {
                var splitIndex = Math.floor(screenRow - row);
                column = splits[splitIndex];
                if(splitIndex > 0 && splits.length) {
-                    wrapIndent = splits.indent;
                    docColumn = splits[splitIndex - 1] || splits[splits.length - 1];
                    line = line.substring(docColumn);
                }
            }
        }

-        docColumn += this.$getStringScreenWidth(line, screenColumn - wrapIndent)[1];
+        docColumn += this.$getStringScreenWidth(line, screenColumn)[1];

        // We remove one character at the end so that the docColumn
        // position returned is not associated to the next row on the screen.
@ -2340,7 +2311,6 @@ var EditSession = function(text, mode) {
            textLine = this.getLine(docRow).substring(0, docColumn);
            foldStartRow = docRow;
        }
-        var wrapIndent = 0;
        // Clamp textLine if in wrapMode.
        if (this.$useWrapMode) {
            var wrapRow = this.$wrapData[foldStartRow];
@ -2353,13 +2323,12 @@ var EditSession = function(text, mode) {
                textLine = textLine.substring(
                    wrapRow[screenRowOffset - 1] || 0, textLine.length
                );
-                wrapIndent = screenRowOffset > 0 ? wrapRow.indent : 0;
            }
        }

        return {
            row: screenRow,
-            column: wrapIndent + this.$getStringScreenWidth(textLine)[0]
+            column: this.$getStringScreenWidth(textLine)[0]
        };
    };

@ -2501,7 +2470,6 @@ config.defineOptions(EditSession.prototype, "session", {

            if (this.$wrap == value)
                return;
-            this.$wrap = value;
            if (!value) {
                this.setUseWrapMode(false);
            } else {
@ -2509,6 +2477,7 @@ config.defineOptions(EditSession.prototype, "session", {
                this.setWrapLimitRange(col, col);
                this.setUseWrapMode(true);
            }
+            this.$wrap = value;
        },
        get: function() {
            if (this.getUseWrapMode()) {
@ -2539,7 +2508,6 @@ config.defineOptions(EditSession.prototype, "session", {
        },
        initialValue: "auto"
    },
-    indentedSoftWrap: { initialValue: true },
    firstLineNumber: {
        set: function() {this._signal("changeBreakpoint");},
        initialValue: 1
--- a/lib/ace/edit_session/bracket_match.js
+++ b/lib/ace/edit_session/bracket_match.js
@ -117,7 +117,7 @@ function BracketMatch() {
            typeRe = new RegExp(
                "(\\.?" +
                token.type.replace(".", "\\.").replace("rparen", ".paren")
-                    .replace(/\b(?:end)\b/, "(?:start|begin|end)")
+                    .replace(/\b(?:end|start|begin)\b/, "")
                + ")+"
            );
        }
@ -174,7 +174,7 @@ function BracketMatch() {
            typeRe = new RegExp(
                "(\\.?" +
                token.type.replace(".", "\\.").replace("lparen", ".paren")
-                    .replace(/\b(?:start|begin)\b/, "(?:start|begin|end)")
+                    .replace(/\b(?:end|start|begin)\b/, "")
                + ")+"
            );
        }
--- a/lib/ace/edit_session/folding.js
+++ b/lib/ace/edit_session/folding.js
@ -696,8 +696,7 @@ function Folding() {
            
        this.$foldMode = foldMode;
        
-        this.off('change', this.$updateFoldWidgets);
-        this.off('tokenizerUpdate', this.$tokenizerUpdateFoldWidgets);
+        this.removeListener('change', this.$updateFoldWidgets);
        this._emit("changeAnnotation");
        
        if (!foldMode || this.$foldStyle == "manual") {
@ -710,9 +709,8 @@ function Folding() {
        this.getFoldWidgetRange = foldMode.getFoldWidgetRange.bind(foldMode, this, this.$foldStyle);
        
        this.$updateFoldWidgets = this.updateFoldWidgets.bind(this);
-        this.$tokenizerUpdateFoldWidgets = this.tokenizerUpdateFoldWidgets.bind(this);
        this.on('change', this.$updateFoldWidgets);
-        this.on('tokenizerUpdate', this.$tokenizerUpdateFoldWidgets);
+        
    };

    this.getParentFoldRangeData = function (row, ignoreCurrent) {
@ -794,7 +792,7 @@ function Folding() {
            this.foldAll(startRow, endRow, options.all ? 10000 : 0);
        } else if (options.children) {
            endRow = range ? range.end.row : this.getLength();
-            this.foldAll(row + 1, endRow, options.all ? 10000 : 0);
+            this.foldAll(row + 1, range.end.row, options.all ? 10000 : 0);
        } else if (range) {
            if (options.all) 
                range.collapseChildren = 10000;
@ -829,13 +827,15 @@ function Folding() {
        }
    };

-    this.updateFoldWidgets = function(delta) {
-        var firstRow = delta.start.row;
-        var len = delta.end.row - firstRow;
+    this.updateFoldWidgets = function(e) {
+        var delta = e.data;
+        var range = delta.range;
+        var firstRow = range.start.row;
+        var len = range.end.row - firstRow;

        if (len === 0) {
            this.foldWidgets[firstRow] = null;
-        } else if (delta.action == 'remove') {
+        } else if (delta.action == "removeText" || delta.action == "removeLines") {
            this.foldWidgets.splice(firstRow, len + 1, null);
        } else {
            var args = Array(len + 1);
@ -843,13 +843,7 @@ function Folding() {
            this.foldWidgets.splice.apply(this.foldWidgets, args);
        }
    };
-    this.tokenizerUpdateFoldWidgets = function(e) {
-        var rows = e.data;
-        if (rows.first != rows.last) {
-            if (this.foldWidgets.length > rows.first)
-                this.foldWidgets.splice(rows.first, this.foldWidgets.length);
-        }
-    }
+
 }

 exports.Folding = Folding;
--- a/lib/ace/edit_session_test.js
+++ b/lib/ace/edit_session_test.js
@ -280,7 +280,7 @@ module.exports = {
        session.setUseWrapMode(true);
        session.setWrapLimitRange(12, 12);
        session.adjustWrapLimit(80);
-        session.setOption("wrapMethod", "text");
+
        assert.position(session.documentToScreenPosition(0, 11), 0, 11);
        assert.position(session.documentToScreenPosition(0, 12), 1, 0);
    },
@ -380,8 +380,7 @@ module.exports = {
            line = lang.stringTrimRight(line);
            var tokens = EditSession.prototype.$getDisplayTokens(line);
            var splits = EditSession.prototype.$computeWrapSplits(tokens, wrapLimit, tabSize);
-            console.log("String:", line, "Result:", splits, "Expected:", assertEqual);
-
+            // console.log("String:", line, "Result:", splits, "Expected:", assertEqual);
            assert.ok(splits.length == assertEqual.length);
            for (var i = 0; i < splits.length; i++) {
                assert.ok(splits[i] == assertEqual[i]);
@ -389,7 +388,6 @@ module.exports = {
        }
        
        EditSession.prototype.$wrapAsCode = true;
-        EditSession.prototype.$indentedSoftWrap = false;
        // Basic splitting.
        computeAndAssert("foo bar foo bar", [ 12 ]);
        computeAndAssert("foo bar f   bar", [ 12 ]);
@ -415,26 +413,16 @@ module.exports = {
        computeAndAssert("ぁぁ", [1], 2);
        computeAndAssert(" ぁぁ", [1, 2], 2);
        computeAndAssert(" ぁ\tぁ", [1, 3], 2);
-        computeAndAssert(" ぁぁ\tぁ", [2, 4], 4);
-        computeAndAssert("ぁぁ ぁぁ\tぁ", [3, 6], 6);
+        computeAndAssert(" ぁぁ\tぁ", [1, 4], 4);

        // Test wrapping for punctuation.
-        computeAndAssert(" ab.c;ef++", [2, 4, 6, 8], 2);
-        computeAndAssert(" ab.c;ef++", [3, 5, 8], 3);
+        computeAndAssert(" ab.c;ef++", [1, 3, 5, 7, 8], 2);
        computeAndAssert(" a.b", [1, 2, 3], 1);
        computeAndAssert("#>>", [1, 2], 1);
        
        // Test wrapping for punctuation in
        EditSession.prototype.$wrapAsCode = false;
        computeAndAssert("ab cde, Juhu kinners", [3, 8, 13, 19], 6);
-
-        // test indented wrapping
-        EditSession.prototype.$indentedSoftWrap = true;
-        computeAndAssert("foo bar foo bar foo bara foo", [12, 25]);
-        computeAndAssert("fooooooooooooooooooooooooooo", [12, 24]);
-        computeAndAssert("\t\tfoo bar fooooooooooobooooooo", [6, 10, 16, 22, 28]);
-        computeAndAssert("\t\t\tfoo bar fooooooooooobooooooo", [3, 7, 11, 17, 23, 29]);
-        computeAndAssert("\tfoo \t \t   \t \t bar", [6, 12]); // 14
    },

    "test get longest line" : function() {
@ -442,12 +430,12 @@ module.exports = {
        session.setTabSize(4);
        assert.equal(session.getScreenWidth(), 2);

-        session.doc.insertMergedLines({row: 0, column: Infinity}, ['', '']);
-        session.doc.insertFullLines(1, ["123"]);
+        session.doc.insertNewLine({row: 0, column: Infinity});
+        session.doc.insertLines(1, ["123"]);
        assert.equal(session.getScreenWidth(), 3);

-        session.doc.insertMergedLines({row: 0, column: Infinity}, ['', '']);
-        session.doc.insertFullLines(1, ["\t\t"]);
+        session.doc.insertNewLine({row: 0, column: Infinity});
+        session.doc.insertLines(1, ["\t\t"]);

        assert.equal(session.getScreenWidth(), 8);

@ -471,9 +459,9 @@ module.exports = {

        session.setUseWrapMode(true);

-        document.insertFullLines(0, ["a", "b"]);
-        document.insertFullLines(2, ["c", "d"]);
-        document.removeFullLines(1, 2);
+        document.insertLines(0, ["a", "b"]);
+        document.insertLines(2, ["c", "d"]);
+        document.removeLines(1, 2);
    },

    "test wrapMode init has to create wrapData array": function() {
--- a/lib/ace/editor.js
+++ b/lib/ace/editor.js
@ -150,24 +150,18 @@ var Editor = function(renderer, session) {
            args: commadEvent.args,
            scrollTop: this.renderer.scrollTop
        };
-        if (this.curOp.command.name && this.curOp.command.scrollIntoView !== undefined)
-            this.$blockScrolling++;
+        
+        // this.selections.push(this.selection.toJSON());
    };

    this.endOperation = function(e) {
        if (this.curOp) {
            if (e && e.returnValue === false)
                return this.curOp = null;
-            this._signal("beforeEndOperation");
+                
            var command = this.curOp.command;
-            if (command.name && this.$blockScrolling > 0)
-                this.$blockScrolling--;
-            var scrollIntoView = command && command.scrollIntoView;
-            if (scrollIntoView) {
-                switch (scrollIntoView) {
-                    case "center-animate":
-                        scrollIntoView = "animate";
-                        /* fall through */
+            if (command && command.scrollIntoView) {
+                switch (command.scrollIntoView) {
                    case "center":
                        this.renderer.scrollCursorIntoView(null, 0.5);
                        break;
@ -185,7 +179,7 @@ var Editor = function(renderer, session) {
                    default:
                        break;
                }
-                if (scrollIntoView == "animate")
+                if (command.scrollIntoView == "animate")
                    this.renderer.animateScrolling(this.curOp.scrollTop);
            }
            
@ -278,10 +272,6 @@ var Editor = function(renderer, session) {
    this.setSession = function(session) {
        if (this.session == session)
            return;
-        
-        // make sure operationEnd events are not emitted to wrong session
-        if (this.curOp) this.endOperation();
-        this.curOp = {};

        var oldSession = this.session;
        if (oldSession) {
@ -381,8 +371,6 @@ var Editor = function(renderer, session) {
            oldSession: oldSession
        });
        
-        this.curOp = null;
-        
        oldSession && oldSession._signal("changeEditor", {oldEditor: this});
        session && session._signal("changeEditor", {editor: this});
    };
@ -548,18 +536,12 @@ var Editor = function(renderer, session) {
            var iterator = new TokenIterator(self.session, pos.row, pos.column);
            var token = iterator.getCurrentToken();
            
-            if (!token || !/\b(?:tag-open|tag-name)/.test(token.type)) {
+            if (!token || token.type.indexOf('tag-name') === -1) {
                session.removeMarker(session.$tagHighlight);
                session.$tagHighlight = null;
                return;
            }
-            
-            if (token.type.indexOf("tag-open") != -1) {
-                token = iterator.stepForward();
-                if (!token)
-                    return;
-            }
-            
+
            var tag = token.value;
            var depth = 0;
            var prevToken = iterator.stepBackward();
@ -692,15 +674,20 @@ var Editor = function(renderer, session) {
     *
     *
     **/
-    this.onDocumentChange = function(delta) {
-        // Rerender and emit "change" event.
-        var wrap = this.session.$useWrapMode;
-        var lastRow = (delta.start.row == delta.end.row ? delta.end.row : Infinity);
-        this.renderer.updateLines(delta.start.row, lastRow, wrap);
+    this.onDocumentChange = function(e) {
+        var delta = e.data;
+        var range = delta.range;
+        var lastRow;

-        this._signal("change", delta);
-        
-        // Update cursor because tab characters can influence the cursor position.
+        if (range.start.row == range.end.row && delta.action != "insertLines" && delta.action != "removeLines")
+            lastRow = range.end.row;
+        else
+            lastRow = Infinity;
+        this.renderer.updateLines(range.start.row, lastRow, this.session.$useWrapMode);
+
+        this._signal("change", e);
+
+        // update cursor because tab characters can influence the cursor position
        this.$cursorChange();
        this.$updateHighlightActiveLine();
    };
@ -727,10 +714,6 @@ var Editor = function(renderer, session) {
        this.$cursorChange();

        if (!this.$blockScrolling) {
-            config.warn("Automatically scrolling cursor into view after selection change",
-                "this will be disabled in the next version",
-                "set editor.$blockScrolling = Infinity to disable this message"
-            );
            this.renderer.scrollCursorIntoView();
        }

@ -915,33 +898,13 @@ var Editor = function(renderer, session) {
     *
     *
     **/
-    this.onPaste = function(text, event) {
-        var e = {text: text, event: event};
-        this.commands.exec("paste", this, e);
-    };
-    
-    this.$handlePaste = function(e) {
-        if (typeof e == "string") 
-            e = {text: e};
+    this.onPaste = function(text) {
+        // todo this should change when paste becomes a command
+        if (this.$readOnly)
+            return;
+        var e = {text: text};
        this._signal("paste", e);
-        var text = e.text;
-        if (!this.inMultiSelectMode || this.inVirtualSelectionMode) {
-            this.insert(text);
-        } else {
-            var lines = text.split(/\r\n|\r|\n/);
-            var ranges = this.selection.rangeList.ranges;
-    
-            if (lines.length > ranges.length || lines.length < 2 || !lines[1])
-                return this.commands.exec("insertstring", this, text);
-    
-            for (var i = ranges.length; i--;) {
-                var range = ranges[i];
-                if (!range.isEmpty())
-                    this.session.remove(range);
-    
-                this.session.insert(range.start, lines[i]);
-            }
-        }
+        this.insert(e.text, true);
    };

    this.execCommand = function(command, args) {
@ -1297,7 +1260,7 @@ var Editor = function(renderer, session) {
    };

    /**
-     * Removes the current selection or one character.
+     * Removes words of text from the editor. A "word" is defined as a string of characters bookended by whitespace.
     * @param {String} dir The direction of the deletion to occur, either "left" or "right"
     *
     **/
@ -1629,7 +1592,15 @@ var Editor = function(renderer, session) {
     **/
    this.removeLines = function() {
        var rows = this.$getSelectedRows();
-        this.session.removeFullLines(rows.first, rows.last);
+        var range;
+        if (rows.first === 0 || rows.last+1 < this.session.getLength())
+            range = new Range(rows.first, 0, rows.last+1, 0);
+        else
+            range = new Range(
+                rows.first-1, this.session.getLine(rows.first-1).length,
+                rows.last, this.session.getLine(rows.last).length
+            );
+        this.session.remove(range);
        this.clearSelection();
    };

@ -1658,7 +1629,9 @@ var Editor = function(renderer, session) {
     * @related EditSession.moveLinesUp
     **/
    this.moveLinesDown = function() {
-        this.$moveLines(1, false);
+        this.$moveLines(function(firstRow, lastRow) {
+            return this.session.moveLinesDown(firstRow, lastRow);
+        });
    };

    /**
@ -1667,7 +1640,9 @@ var Editor = function(renderer, session) {
     * @related EditSession.moveLinesDown
     **/
    this.moveLinesUp = function() {
-        this.$moveLines(-1, false);
+        this.$moveLines(function(firstRow, lastRow) {
+            return this.session.moveLinesUp(firstRow, lastRow);
+        });
    };

    /**
@ -1691,7 +1666,10 @@ var Editor = function(renderer, session) {
     *
     **/
    this.copyLinesUp = function() {
-        this.$moveLines(-1, true);
+        this.$moveLines(function(firstRow, lastRow) {
+            this.session.duplicateLines(firstRow, lastRow);
+            return 0;
+        });
    };

    /**
@ -1701,61 +1679,51 @@ var Editor = function(renderer, session) {
     *
     **/
    this.copyLinesDown = function() {
-        this.$moveLines(1, true);
+        this.$moveLines(function(firstRow, lastRow) {
+            return this.session.duplicateLines(firstRow, lastRow);
+        });
    };

    /**
-     * for internal use
-     * @ignore
+     * Executes a specific function, which can be anything that manipulates selected lines, such as copying them, duplicating them, or shifting them.
+     * @param {Function} mover A method to call on each selected row
+     *
     *
     **/
-    this.$moveLines = function(dir, copy) {
-        var rows, moved;
+    this.$moveLines = function(mover) {
        var selection = this.selection;
        if (!selection.inMultiSelectMode || this.inVirtualSelectionMode) {
            var range = selection.toOrientedRange();
-            rows = this.$getSelectedRows(range);
-            moved = this.session.$moveLines(rows.first, rows.last, copy ? 0 : dir);
-            if (copy && dir == -1) moved = 0;
-            range.moveBy(moved, 0);
+            var rows = this.$getSelectedRows(range);
+            var linesMoved = mover.call(this, rows.first, rows.last);
+            range.moveBy(linesMoved, 0);
            selection.fromOrientedRange(range);
        } else {
            var ranges = selection.rangeList.ranges;
            selection.rangeList.detach(this.session);
-            this.inVirtualSelectionMode = true;
-            
-            var diff = 0;
-            var totalDiff = 0;
-            var l = ranges.length;
-            for (var i = 0; i < l; i++) {
+
+            for (var i = ranges.length; i--; ) {
                var rangeIndex = i;
-                ranges[i].moveBy(diff, 0);
-                rows = this.$getSelectedRows(ranges[i]);
-                var first = rows.first;
-                var last = rows.last;
-                while (++i < l) {
-                    if (totalDiff) ranges[i].moveBy(totalDiff, 0);
-                    var subRows = this.$getSelectedRows(ranges[i]);
-                    if (copy && subRows.first != last)
+                var rows = ranges[i].collapseRows();
+                var last = rows.end.row;
+                var first = rows.start.row;
+                while (i--) {
+                    rows = ranges[i].collapseRows();
+                    if (first - rows.end.row <= 1)
+                        first = rows.end.row;
+                    else
                        break;
-                    else if (!copy && subRows.first > last + 1)
-                        break;
-                    last = subRows.last;
                }
-                i--;
-                diff = this.session.$moveLines(first, last, copy ? 0 : dir);
-                if (copy && dir == -1) rangeIndex = i + 1;
-                while (rangeIndex <= i) {
-                    ranges[rangeIndex].moveBy(diff, 0);
-                    rangeIndex++;
+                i++;
+
+                var linesMoved = mover.call(this, first, last);
+                while (rangeIndex >= i) {
+                    ranges[rangeIndex].moveBy(linesMoved, 0);
+                    rangeIndex--;
                }
-                if (!copy) diff = 0;
-                totalDiff += diff;
            }
-            
            selection.fromOrientedRange(selection.ranges[0]);
            selection.rangeList.attach(this.session);
-            this.inVirtualSelectionMode = false;
        }
    };

@ -1768,8 +1736,8 @@ var Editor = function(renderer, session) {
     *
     * @returns {Object}
     **/
-    this.$getSelectedRows = function(range) {
-        range = (range || this.getSelectionRange()).collapseRows();
+    this.$getSelectedRows = function() {
+        var range = this.getSelectionRange().collapseRows();

        return {
            first: this.session.getRowFoldStart(range.start.row),
@ -2682,7 +2650,6 @@ config.defineOptions(Editor.prototype, "editor", {
    useSoftTabs: "session",
    tabSize: "session",
    wrap: "session",
-    indentedSoftWrap: "session",
    foldStyle: "session",
    mode: "session"
 });
--- a/lib/ace/ext/chromevox.js
+++ b/lib/ace/ext/chromevox.js
@ -578,14 +578,15 @@ var onSelectionChange = function(evt) {
 * and deleting text.
 * @param {!Event} evt The event.
 */
-var onChange = function(delta) {
+var onChange = function(evt) {
+  var data = evt.data;
  switch (data.action) {
-  case 'remove':
+  case 'removeText':
    cvox.Api.speak(data.text, 0, DELETED_PROP);
    /* Let the future cursor change event know it's from text change. */
    changed = true;
    break;
-  case 'insert':
+  case 'insertText':
    cvox.Api.speak(data.text, 0);
    /* Let the future cursor change event know it's from text change. */
    changed = true;
--- a/lib/ace/ext/elastic_tabstops_lite.js
+++ b/lib/ace/ext/elastic_tabstops_lite.js
@ -44,12 +44,13 @@ var ElasticTabstopsLite = function(editor) {
    this.onExec = function() {
        recordChanges = true;
    };
-    this.onChange = function(delta) {
+    this.onChange = function(e) {
+        var range = e.data.range
        if (recordChanges) {
-            if (changedRows.indexOf(delta.start.row) == -1)
-                changedRows.push(delta.start.row);
-            if (delta.end.row != delta.start.row)
-                changedRows.push(delta.end.row);
+            if (changedRows.indexOf(range.start.row) == -1)
+                changedRows.push(range.start.row);
+            if (range.end.row != range.start.row)
+                changedRows.push(range.end.row);
        }
    };
 };
--- a/lib/ace/ext/emmet.js
+++ b/lib/ace/ext/emmet.js
@ -393,7 +393,7 @@ exports.updateCommands = function(editor, enabled) {
 };

 exports.isSupportedMode = function(modeId) {
-    return modeId && /css|less|scss|sass|stylus|html|php|twig|ejs|handlebars/.test(modeId);
+    return modeId && /css|less|scss|sass|stylus|html|php|twig|ejs/.test(modeId);
 };

 var onChangeMode = function(e, target) {
--- a/lib/ace/ext/error_marker.js
+++ b/lib/ace/ext/error_marker.js
@ -62,7 +62,7 @@ function findAnnotations(session, row, dir) {
    if (i < 0)
        i = -i - 1;
    
-    if (i >= annotations.length)
+    if (i >= annotations.length - 1)
        i = dir > 0 ? 0 : annotations.length - 1;
    else if (i === 0 && dir < 0)
        i = annotations.length - 1;
--- a/lib/ace/ext/language_tools.js
+++ b/lib/ace/ext/language_tools.js
@ -140,7 +140,7 @@ var loadSnippetFile = function(id) {
 function getCompletionPrefix(editor) {
    var pos = editor.getCursorPosition();
    var line = editor.session.getLine(pos.row);
-    var prefix;
+    var prefix = util.retrievePrecedingIdentifier(line, pos.column);
    // Try to find custom prefixes on the completers
    editor.completers.forEach(function(completer) {
        if (completer.identifierRegexps) {
@ -150,13 +150,16 @@ function getCompletionPrefix(editor) {
            });
        }
    });
-    return prefix || util.retrievePrecedingIdentifier(line, pos.column);
+    return prefix;
 }

 var doLiveAutocomplete = function(e) {
    var editor = e.editor;
+    var text = e.args || "";
    var hasCompleter = editor.completer && editor.completer.activated;

+
+
    // We don't want to autocomplete with no prefix
    if (e.command.name === "backspace") {
        if (hasCompleter && !getCompletionPrefix(editor))
@ -171,6 +174,7 @@ var doLiveAutocomplete = function(e) {
                editor.completer = new Autocomplete();
            }
            // Disable autoInsert
+            editor.completer.autoSelect = false;
            editor.completer.autoInsert = false;
            editor.completer.showPopup(editor);
        }
--- a/lib/ace/ext/menu_tools/generate_settings_menu.js
+++ b/lib/ace/ext/menu_tools/generate_settings_menu.js
@ -91,12 +91,6 @@ module.exports.generateSettingsMenu = function generateSettingsMenu (editor) {
        elements.forEach(function(element) {
            topmenu.appendChild(element);
        });
-        
-        var el = topmenu.appendChild(document.createElement('div'));
-        var version = "1.1.9";
-        el.style.padding = "1em";
-        el.textContent = "Ace version " + version;
-        
        return topmenu;
    }
    /**
--- a/lib/ace/ext/modelist.js
+++ b/lib/ace/ext/modelist.js
@ -43,11 +43,10 @@ Mode.prototype.supportsFile = function(filename) {
 // todo firstlinematch
 var supportedModes = {
    ABAP:        ["abap"],
-    ABC:         ["abc"],
    ActionScript:["as"],
    ADA:         ["ada|adb"],
    Apache_Conf: ["^htaccess|^htgroups|^htpasswd|^conf|htaccess|htgroups|htpasswd"],
-    AsciiDoc:    ["asciidoc|adoc"],
+    AsciiDoc:    ["asciidoc"],
    Assembly_x86:["asm"],
    AutoHotKey:  ["ahk"],
    BatchFile:   ["bat|cmd"],
@ -99,7 +98,6 @@ var supportedModes = {
    JSX:         ["jsx"],
    Julia:       ["jl"],
    LaTeX:       ["tex|latex|ltx|bib"],
-    Lean:        ["lean|hlean"],
    LESS:        ["less"],
    Liquid:      ["liquid"],
    Lisp:        ["lisp"],
@ -111,19 +109,17 @@ var supportedModes = {
    Lucene:      ["lucene"],
    Makefile:    ["^Makefile|^GNUmakefile|^makefile|^OCamlMakefile|make"],
    Markdown:    ["md|markdown"],
-    Mask:        ["mask"],
    MATLAB:      ["matlab"],
    MEL:         ["mel"],
    MUSHCode:    ["mc|mush"],
    MySQL:       ["mysql"],
    Nix:         ["nix"],
-    Nim:         ["nim"],
    ObjectiveC:  ["m|mm"],
    OCaml:       ["ml|mli"],
    Pascal:      ["pas|p"],
    Perl:        ["pl|pm"],
    pgSQL:       ["pgsql"],
-    PHP:         ["php|phtml|shtml|php3|php4|php5|phps|phpt|aw|ctp"],
+    PHP:         ["php|phtml"],
    Powershell:  ["ps1"],
    Praat:       ["praat|praatscript|psc|proc"],
    Prolog:      ["plg|prolog"],
@ -147,7 +143,6 @@ var supportedModes = {
    Soy_Template:["soy"],
    Space:       ["space"],
    SQL:         ["sql"],
-    SQLServer:   ["sqlserver"],
    Stylus:      ["styl|stylus"],
    SVG:         ["svg"],
    Tcl:         ["tcl"],
@ -162,11 +157,9 @@ var supportedModes = {
    Velocity:    ["vm"],
    Verilog:     ["v|vh|sv|svh"],
    VHDL:        ["vhd|vhdl"],
-    XML:         ["xml|rdf|rss|wsdl|xslt|atom|mathml|mml|xul|xbl|xaml"],
+    XML:         ["xml|rdf|rss|wsdl|xslt|atom|mathml|mml|xul|xbl"],
    XQuery:      ["xq"],
-    YAML:        ["yaml|yml"],
-    // Add the missing mode "Django" to ext-modelist
-    Django:      ["html"]
+    YAML:        ["yaml|yml"]
 };

 var nameOverrides = {
@ -195,3 +188,4 @@ module.exports = {
 };

 });
+
--- a/lib/ace/ext/static.css
+++ b/lib/ace/ext/static.css
@ -1,31 +1,24 @@
 .ace_static_highlight {
-    font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', 'Droid Sans Mono', monospace;
-    font-size: 12px;
-    white-space: pre-wrap
+   font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', 'Droid Sans Mono', monospace;
+   font-size: 12px;
 }

 .ace_static_highlight .ace_gutter {
-    width: 2em;
+    width: 25px !important;
+    float: left;
    text-align: right;
    padding: 0 3px 0 0;
    margin-right: 3px;
+    position: static !important;
 }

-.ace_static_highlight.ace_show_gutter .ace_line {
-    padding-left: 2.6em;
-}
-
-.ace_static_highlight .ace_line { position: relative; }
+.ace_static_highlight .ace_line { clear: both; }

 .ace_static_highlight .ace_gutter-cell {
-    -moz-user-select: -moz-none;
-    -khtml-user-select: none;
-    -webkit-user-select: none;
-    user-select: none;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    position: absolute;
+  -moz-user-select: -moz-none;
+  -khtml-user-select: none;
+  -webkit-user-select: none;
+  user-select: none;
 }


--- a/lib/ace/ext/static_highlight.js
+++ b/lib/ace/ext/static_highlight.js
@ -37,10 +37,6 @@ var baseStyles = require("../requirejs/text!./static.css");
 var config = require("../config");
 var dom = require("../lib/dom");

-var SimpleTextLayer = function() {
-    this.config = {};
-};
-SimpleTextLayer.prototype = TextLayer.prototype;

 var highlight = function(el, opts, callback) {
    var m = el.className.match(/lang-(\w+)/);
@ -153,8 +149,12 @@ highlight.renderSync = function(input, mode, theme, lineStart, disableGutter) {
    session.setUseWorker(false);
    session.setMode(mode);

-    var textLayer = new SimpleTextLayer();
+    var textLayer = new TextLayer(document.createElement("div"));
    textLayer.setSession(session);
+    textLayer.config = {
+        characterWidth: 10,
+        lineHeight: 20
+    };

    session.setValue(input);

@ -171,8 +171,7 @@ highlight.renderSync = function(input, mode, theme, lineStart, disableGutter) {

    // let's prepare the whole html
    var html = "<div class='" + theme.cssClass + "'>" +
-        "<div class='ace_static_highlight" + (disableGutter ? "" : " ace_show_gutter") +
-            "' style='counter-reset:ace_line " + (lineStart - 1) + "'>" +
+        "<div class='ace_static_highlight' style='counter-reset:ace_line " + (lineStart - 1) + "'>" +
            stringBuilder.join("") +
        "</div>" +
    "</div>";
--- a/lib/ace/ext/static_highlight_test.js
+++ b/lib/ace/ext/static_highlight_test.js
@ -28,12 +28,12 @@ module.exports = {
        var mode = new JavaScriptMode();

        var result = highlighter.render(snippet, mode, theme);
-        assert.equal(result.html, "<div class='ace-tomorrow'><div class='ace_static_highlight ace_show_gutter' style='counter-reset:ace_line 0'>" 
-            + "<div class='ace_line'><span class='ace_gutter ace_gutter-cell' unselectable='on'></span><span class='ace_comment ace_doc'>/** this is a function</span>\n</div>"
+        assert.equal(result.html, "<div class='ace-tomorrow'><div class='ace_static_highlight' style='counter-reset:ace_line 0'>" 
+            + "<div class='ace_line'><span class='ace_gutter ace_gutter-cell' unselectable='on'></span><span class='ace_comment ace_doc'>/**\xa0this\xa0is\xa0a\xa0function</span>\n</div>"
            + "<div class='ace_line'><span class='ace_gutter ace_gutter-cell' unselectable='on'></span><span class='ace_comment ace_doc'>*</span>\n</div>"
            + "<div class='ace_line'><span class='ace_gutter ace_gutter-cell' unselectable='on'></span><span class='ace_comment ace_doc'>*/</span>\n</div>"
-            + "<div class='ace_line'><span class='ace_gutter ace_gutter-cell' unselectable='on'></span><span class='ace_storage ace_type'>function</span> <span class='ace_entity ace_name ace_function'>hello</span> <span class='ace_paren ace_lparen'>(</span><span class='ace_variable ace_parameter'>a</span><span class='ace_punctuation ace_operator'>, </span><span class='ace_variable ace_parameter'>b</span><span class='ace_punctuation ace_operator'>, </span><span class='ace_variable ace_parameter'>c</span><span class='ace_paren ace_rparen'>)</span> <span class='ace_paren ace_lparen'>{</span>\n</div>"
-            + "<div class='ace_line'><span class='ace_gutter ace_gutter-cell' unselectable='on'></span>    <span class='ace_storage ace_type'>console</span><span class='ace_punctuation ace_operator'>.</span><span class='ace_support ace_function ace_firebug'>log</span><span class='ace_paren ace_lparen'>(</span><span class='ace_identifier'>a</span> <span class='ace_keyword ace_operator'>*</span> <span class='ace_identifier'>b</span> <span class='ace_keyword ace_operator'>+</span> <span class='ace_identifier'>c</span> <span class='ace_keyword ace_operator'>+</span> <span class='ace_string'>'sup$'</span><span class='ace_paren ace_rparen'>)</span><span class='ace_punctuation ace_operator'>;</span>\n</div>"
+            + "<div class='ace_line'><span class='ace_gutter ace_gutter-cell' unselectable='on'></span><span class='ace_storage ace_type'>function</span>\xa0<span class='ace_entity ace_name ace_function'>hello</span>\xa0<span class='ace_paren ace_lparen'>(</span><span class='ace_variable ace_parameter'>a</span><span class='ace_punctuation ace_operator'>,\xa0</span><span class='ace_variable ace_parameter'>b</span><span class='ace_punctuation ace_operator'>,\xa0</span><span class='ace_variable ace_parameter'>c</span><span class='ace_paren ace_rparen'>)</span>\xa0<span class='ace_paren ace_lparen'>{</span>\n</div>"
+            + "<div class='ace_line'><span class='ace_gutter ace_gutter-cell' unselectable='on'></span>\xa0\xa0\xa0\xa0<span class='ace_storage ace_type'>console</span><span class='ace_punctuation ace_operator'>.</span><span class='ace_support ace_function ace_firebug'>log</span><span class='ace_paren ace_lparen'>(</span><span class='ace_identifier'>a</span>\xa0<span class='ace_keyword ace_operator'>*</span>\xa0<span class='ace_identifier'>b</span>\xa0<span class='ace_keyword ace_operator'>+</span>\xa0<span class='ace_identifier'>c</span>\xa0<span class='ace_keyword ace_operator'>+</span>\xa0<span class='ace_string'>'sup$'</span><span class='ace_paren ace_rparen'>)</span><span class='ace_punctuation ace_operator'>;</span>\n</div>"
            + "<div class='ace_line'><span class='ace_gutter ace_gutter-cell' unselectable='on'></span><span class='ace_paren ace_rparen'>}</span>\n</div>"
            + "</div></div>");
        assert.ok(!!result.css);
--- a/lib/ace/ext/statusbar.js
+++ b/lib/ace/ext/statusbar.js
@ -28,8 +28,9 @@ var StatusBar = function(editor, parentNode) {
            str && status.push(str, separator || "|");
        }

-        add(editor.keyBinding.getStatusText(editor));
-        if (editor.commands.recording)
+        if (editor.$vimModeHandler)
+            add(editor.$vimModeHandler.getStatusText());
+        else if (editor.commands.recording)
            add("REC");

        var c = editor.selection.lead;
--- a/lib/ace/ext/themelist.js
+++ b/lib/ace/ext/themelist.js
@ -51,14 +51,12 @@ var themeData = [
    ["Dreamweaver"    ],
    ["Eclipse"        ],
    ["GitHub"         ],
-    ["IPlastic"       ],
    ["Solarized Light"],
    ["TextMate"       ],
    ["Tomorrow"       ],
    ["XCode"          ],
    ["Kuroir"],
    ["KatzenMilch"],
-    ["SQL Server"           ,"sqlserver"               , "light"],
    ["Ambiance"             ,"ambiance"                ,  "dark"],
    ["Chaos"                ,"chaos"                   ,  "dark"],
    ["Clouds Midnight"      ,"clouds_midnight"         ,  "dark"],
@ -73,7 +71,6 @@ var themeData = [
    ["Solarized Dark"       ,"solarized_dark"          ,  "dark"],
    ["Terminal"             ,"terminal"                ,  "dark"],
    ["Tomorrow Night"       ,"tomorrow_night"          ,  "dark"],
-    ["The Night After Tomorrow"       ,"the_night_after_tomorrow"          ,  "dark"],
    ["Tomorrow Night Blue"  ,"tomorrow_night_blue"     ,  "dark"],
    ["Tomorrow Night Bright","tomorrow_night_bright"   ,  "dark"],
    ["Tomorrow Night 80s"   ,"tomorrow_night_eighties" ,  "dark"],
--- a/lib/ace/incremental_search.js
+++ b/lib/ace/incremental_search.js
@ -64,34 +64,6 @@ function IncrementalSearch() {

 oop.inherits(IncrementalSearch, Search);

-// regexp handling
-
-function isRegExp(obj) {
-    return obj instanceof RegExp;
-}
-
-function regExpToObject(re) {
-    var string = String(re),
-        start = string.indexOf('/'),
-        flagStart = string.lastIndexOf('/');
-    return {
-        expression: string.slice(start+1, flagStart),
-        flags: string.slice(flagStart+1)
-    }
-}
-
-function stringToRegExp(string, flags) {
-    try {
-        return new RegExp(string, flags);
-    } catch (e) { return string; }
-}
-
-function objectToRegExp(obj) {
-    return stringToRegExp(obj.expression, obj.flags);
-}
-
-// iSearch class
-
 ;(function() {

    this.activate = function(ed, backwards) {
@ -105,7 +77,7 @@ function objectToRegExp(obj) {
        this.$mousedownHandler = ed.addEventListener('mousedown', this.onMouseDown.bind(this));
        this.selectionFix(ed);
        this.statusMessage(true);
-    };
+    }

    this.deactivate = function(reset) {
        this.cancelSearch(reset);
@ -117,7 +89,7 @@ function objectToRegExp(obj) {
        }
        ed.onPaste = this.$originalEditorOnPaste;
        this.message('');
-    };
+    }

    this.selectionFix = function(editor) {
        // Fix selection bug: When clicked inside the editor
@ -128,7 +100,7 @@ function objectToRegExp(obj) {
        if (editor.selection.isEmpty() && !editor.session.$emacsMark) {
            editor.clearSelection();
        }
-    };
+    }

    this.highlight = function(regexp) {
        var sess = this.$editor.session,
@ -136,7 +108,7 @@ function objectToRegExp(obj) {
                new SearchHighlight(null, "ace_isearch-result", "text"));
        hl.setRegexp(regexp);
        sess._emit("changeBackMarker"); // force highlight layer redraw
-    };
+    }

    this.cancelSearch = function(reset) {
        var e = this.$editor;
@ -150,7 +122,7 @@ function objectToRegExp(obj) {
        }
        this.highlight(null);
        return Range.fromPoints(this.$currentPos, this.$currentPos);
-    };
+    }

    this.highlightAndFindWithNeedle = function(moveToNext, needleUpdateFunc) {
        if (!this.$editor) return null;
@ -163,46 +135,36 @@ function objectToRegExp(obj) {
        if (options.needle.length === 0) {
            this.statusMessage(true);
            return this.cancelSearch(true);
-        }
+        };

        // try to find the next occurence and enable  highlighting marker
        options.start = this.$currentPos;
        var session = this.$editor.session,
-            found = this.find(session),
-            shouldSelect = this.$editor.emacsMark ?
-                !!this.$editor.emacsMark() : !this.$editor.selection.isEmpty();
+            found = this.find(session);
        if (found) {
            if (options.backwards) found = Range.fromPoints(found.end, found.start);
-            this.$editor.selection.setRange(Range.fromPoints(shouldSelect ? this.$startPos : found.end, found.end));
+            this.$editor.moveCursorToPosition(found.end);
            if (moveToNext) this.$currentPos = found.end;
            // highlight after cursor move, so selection works properly
-            this.highlight(options.re);
+            this.highlight(options.re)
        }

        this.statusMessage(found);

        return found;
-    };
+    }

    this.addString = function(s) {
        return this.highlightAndFindWithNeedle(false, function(needle) {
-            if (!isRegExp(needle))
-              return needle + s;
-            var reObj = regExpToObject(needle);
-            reObj.expression += s;
-            return objectToRegExp(reObj);
+            return needle + s;
        });
-    };
+    }

    this.removeChar = function(c) {
        return this.highlightAndFindWithNeedle(false, function(needle) {
-            if (!isRegExp(needle))
-              return needle.substring(0, needle.length-1);
-            var reObj = regExpToObject(needle);
-            reObj.expression = reObj.expression.substring(0, reObj.expression.length-1);
-            return objectToRegExp(reObj);
+            return needle.length > 0 ? needle.substring(0, needle.length-1) : needle;
        });
-    };
+    }

    this.next = function(options) {
        // try to find the next occurence of whatever we have searched for
@ -215,29 +177,17 @@ function objectToRegExp(obj) {
            return options.useCurrentOrPrevSearch && needle.length === 0 ?
                this.$prevNeedle || '' : needle;
        });
-    };
+    }

    this.onMouseDown = function(evt) {
        // when mouse interaction happens then we quit incremental search
        this.deactivate();
        return true;
-    };
+    }

    this.onPaste = function(text) {
        this.addString(text);
-    };
-
-    this.convertNeedleToRegExp = function() {
-        return this.highlightAndFindWithNeedle(false, function(needle) {
-            return isRegExp(needle) ? needle : stringToRegExp(needle, 'ig');
-        });
-    };
-
-    this.convertNeedleToString = function() {
-        return this.highlightAndFindWithNeedle(false, function(needle) {
-            return isRegExp(needle) ? regExpToObject(needle).expression : needle;
-        });
-    };
+    }

    this.statusMessage = function(found) {
        var options = this.$options, msg = '';
@ -245,7 +195,7 @@ function objectToRegExp(obj) {
        msg += 'isearch: ' + options.needle;
        msg += found ? '' : ' (not found)';
        this.message(msg);
-    };
+    }

    this.message = function(msg) {
        if (this.$editor.showCommandLine) {
@ -254,7 +204,7 @@ function objectToRegExp(obj) {
        } else {
            console.log(msg);
        }
-    };
+    }

 }).call(IncrementalSearch.prototype);

--- a/lib/ace/incremental_search_test.js
+++ b/lib/ace/incremental_search_test.js
@ -35,17 +35,13 @@ if (typeof process !== "undefined") {
 define(function(require, exports, module) {
 "use strict";

-var emacs = require('./keyboard/emacs');
 var EditSession = require("./edit_session").EditSession;
 var Editor = require("./editor").Editor;
 var MockRenderer = require("./test/mockrenderer").MockRenderer;
 var Range = require("./range").Range;
-var MultiSelect = require("./multi_select").MultiSelect;
 var assert = require("./test/assertions");
 var IncrementalSearch = require("./incremental_search").IncrementalSearch;

-require("./multi_select");
-
 var editor, iSearch;
 function testRanges(str, ranges) {
    ranges = ranges || editor.selection.getAllRanges();
@ -73,7 +69,6 @@ module.exports = {
    setUp: function() {
        var session = new EditSession(["abc123", "xyz124"]);
        editor = new Editor(new MockRenderer(), session);
-        new MultiSelect(editor);
        iSearch = new IncrementalSearch();
    },

@ -200,7 +195,7 @@ module.exports = {
        editor.keyBinding.addKeyboardHandler(emacs.handler);
        emacs.handler.commands.setMark.exec(editor);
        iSearch.activate(editor);
-        iSearch.addString('1'); iSearch.addString('2');
+        iSearch.addString('1'); iSearch.addString('2');;
        testRanges("Range: [0/0] -> [0/5]", [editor.getSelectionRange()], "sel range");
    }

--- a/lib/ace/keyboard/emacs.js
+++ b/lib/ace/keyboard/emacs.js
@ -125,24 +125,6 @@ exports.handler.attach = function(editor) {
        return this.session.$emacsMark || this.session.$emacsMarkRing.slice(-1)[0];
    };

-    editor.emacsMarkForSelection = function(replacement) {
-        // find the mark in $emacsMarkRing corresponding to the current
-        // selection
-        var sel = this.selection,
-            multiRangeLength = this.multiSelect ?
-                this.multiSelect.getAllRanges().length : 1,
-            selIndex = sel.index || 0,
-            markRing = this.session.$emacsMarkRing,
-            markIndex = markRing.length - (multiRangeLength - selIndex),
-            lastMark = markRing[markIndex] || sel.anchor;
-        if (replacement) {
-            markRing.splice(markIndex, 1,
-                "row" in replacement && "column" in replacement ?
-                    replacement : undefined);
-        }
-        return lastMark;
-    }
-
    editor.on("click", $resetMarkMode);
    editor.on("changeSession", $kbSessionChange);
    editor.renderer.screenToTextCoordinates = screenToTextBlockCoordinates;
@ -164,7 +146,6 @@ exports.handler.detach = function(editor) {
    editor.commands.removeCommands(commands);
    editor.removeEventListener('copy', this.onCopy);
    editor.removeEventListener('paste', this.onPaste);
-    editor.$emacsModeHandler = null;
 };

 var $kbSessionChange = function(e) {
@ -206,7 +187,7 @@ exports.handler.onCopy = function(e, editor) {
    if (editor.$handlesEmacsOnCopy) return;
    editor.$handlesEmacsOnCopy = true;
    exports.handler.commands.killRingSave.exec(editor);
-    editor.$handlesEmacsOnCopy = false;
+    delete editor.$handlesEmacsOnCopy;
 };

 exports.handler.onPaste = function(e, editor) {
@ -239,22 +220,12 @@ exports.handler.bindKey = function(key, command) {
    }, this);
 };

-exports.handler.getStatusText = function(editor, data) {
-  var str = "";
-  if (data.count)
-    str += data.count;
-  if (data.keyChain)
-    str += " " + data.keyChain
-  return str;
-};
-
 exports.handler.handleKeyboard = function(data, hashId, key, keyCode) {
    // if keyCode == -1 a non-printable key was pressed, such as just
    // control. Handling those is currently not supported in this handler
    if (keyCode === -1) return undefined;

    var editor = data.editor;
-    editor._signal("changeStatus");
    // insertstring data.count times
    if (hashId == -1) {
        editor.pushEmacsMark();
@ -265,17 +236,24 @@ exports.handler.handleKeyboard = function(data, hashId, key, keyCode) {
        }
    }

+    if (key == "\x00") return undefined;
+
    var modifier = eMods[hashId];

    // CTRL + number / universalArgument for setting data.count
-    if (modifier == "c-" || data.count) {
+    if (modifier == "c-" || data.universalArgument) {
+        var prevCount = String(data.count || 0);
        var count = parseInt(key[key.length - 1]);
        if (typeof count === 'number' && !isNaN(count)) {
-            data.count = Math.max(data.count, 0) || 0;
-            data.count = 10 * data.count + count;
+            data.count = parseInt(prevCount + count);
            return {command: "null"};
+        } else if (data.universalArgument) {
+            // if no number pressed use emacs defaults for universalArgument
+            // which is 4
+            data.count = 4;
        }
    }
+    data.universalArgument = false;

    // this.commandKeyBinding maps key specs like "c-p" (for CTRL + P) to
    // command objects, for lookup key needs to include the modifier
@ -297,9 +275,7 @@ exports.handler.handleKeyboard = function(data, hashId, key, keyCode) {
    if (command === "null") return {command: "null"};

    if (command === "universalArgument") {
-        // if no number pressed emacs repeats action 4 times.
-        // minus sign is needed to allow next keypress to replace it
-        data.count = -4;
+        data.universalArgument = true;
        return {command: "null"};
    }

@ -342,8 +318,7 @@ exports.handler.handleKeyboard = function(data, hashId, key, keyCode) {
                    exec: function(editor, args) {
                        for (var i = 0; i < count; i++)
                            command.exec(editor, args);
-                    },
-                    multiSelectAction: command.multiSelectAction
+                    }
                }
            };
        } else {
@ -428,7 +403,7 @@ exports.emacsKeys = {
    "M-;": "togglecomment",

    "C-/|C-x u|S-C--|C-z": "undo",
-    "S-C-/|S-C-x u|C--|S-C-z": "redo", // infinite undo?
+    "S-C-/|S-C-x u|C--|S-C-z": "redo", //infinite undo?
    // vertical editing
    "C-x r":  "selectRectangularRegion",
    "M-x": {command: "focusCommandLine", args: "M-x "}
@ -464,63 +439,59 @@ exports.handler.addCommands({
            // selection modification commands. That is,
            // "goto" commands become "select" commands.
            // Any insertion or mouse click resets mark-mode.
-            // setMark twice in a row at the same place resets markmode.
-            // in multi select mode, ea selection is handled individually
-
+            // setMark twice in a row at the same place resets markmode
            if (args && args.count) {
-                if (editor.inMultiSelectMode) editor.forEachSelection(moveToMark);
-                else moveToMark();
-                moveToMark();
+                var mark = editor.popEmacsMark();
+                mark && editor.selection.moveCursorToPosition(mark);
                return;
            }

            var mark = editor.emacsMark(),
-                ranges = editor.selection.getAllRanges(),
-                rangePositions = ranges.map(function(r) { return {row: r.start.row, column: r.start.column}; }),
-                transientMarkModeActive = true,
-                hasNoSelection = ranges.every(function(range) { return range.isEmpty(); });
+                transientMarkModeActive = true;
+
            // if transientMarkModeActive then mark behavior is a little
            // different. Deactivate the mark when setMark is run with active
            // mark
-            if (transientMarkModeActive && (mark || !hasNoSelection)) {
-                if (editor.inMultiSelectMode) editor.forEachSelection({exec: editor.clearSelection.bind(editor)});
-                else editor.clearSelection();
-                if (mark) editor.pushEmacsMark(null);
+            if (transientMarkModeActive && (mark || !editor.selection.isEmpty())) {
+                editor.pushEmacsMark();
+                editor.clearSelection();
                return;
            }

-            if (!mark) {
-                rangePositions.forEach(function(pos) { editor.pushEmacsMark(pos); });
-                editor.setEmacsMark(rangePositions[rangePositions.length-1]);
-                return;
+            if (mark) {
+                var cp = editor.getCursorPosition();
+                if (editor.selection.isEmpty() &&
+                    mark.row == cp.row && mark.column == cp.column) {
+                    editor.pushEmacsMark();
+                    return;
+                }
            }
-
-            // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-
-            function moveToMark() {
-                var mark = editor.popEmacsMark();
-                mark && editor.moveCursorToPosition(mark);
-            }
-
+            // turn on mark mode
+            mark = editor.getCursorPosition();
+            editor.setEmacsMark(mark);
+            editor.selection.setSelectionAnchor(mark.row, mark.column);
        },
        readOnly: true,
-        handlesCount: true
+        handlesCount: true,
+        multiSelectAction: "forEach"
    },
    exchangePointAndMark: {
-        exec: function exchangePointAndMark$exec(editor, args) {
+        exec: function(editor, args) {
            var sel = editor.selection;
-            if (!args.count && !sel.isEmpty()) { // just invert selection
-                sel.setSelectionRange(sel.getRange(), !sel.isBackwards());
+            if (args.count) {
+                var pos = editor.getCursorPosition();
+                sel.clearSelection();
+                sel.moveCursorToPosition(editor.popEmacsMark());
+                editor.pushEmacsMark(pos);
                return;
            }
-
-            if (args.count) { // replace mark and point
-                var pos = {row: sel.lead.row, column: sel.lead.column};
-                sel.clearSelection();
-                sel.moveCursorToPosition(editor.emacsMarkForSelection(pos));
-            } else { // create selection to last mark
-                sel.selectToPosition(editor.emacsMarkForSelection());
+            var lastMark = editor.getLastEmacsMark();
+            var range = sel.getRange();
+            if (range.isEmpty()) {
+                sel.selectToPosition(lastMark);
+                return;
            }
+            sel.setSelectionRange(range, !sel.isBackwards());
        },
        readOnly: true,
        handlesCount: true,
@ -573,7 +544,6 @@ exports.handler.addCommands({
        if (editor.keyBinding.$data.lastCommand != "yank")
            return;
        editor.undo();
-        editor.session.$emacsMarkRing.pop(); // also undo recording mark
        editor.onPaste(exports.killRing.rotate());
        editor.keyBinding.$data.lastCommand = "yank";
    },
@ -587,25 +557,12 @@ exports.handler.addCommands({
    },
    killRingSave: {
        exec: function(editor) {
-            // copy text and deselect. will save marks for starts of the
-            // selection(s)
-
-            editor.$handlesEmacsOnCopy = true;
-            var marks = editor.session.$emacsMarkRing.slice(),
-                deselectedMarks = [];
            exports.killRing.add(editor.getCopyText());
-
            setTimeout(function() {
-                function deselect() {
-                    var sel = editor.selection, range = sel.getRange(),
-                        pos = sel.isBackwards() ? range.end : range.start;
-                    deselectedMarks.push({row: pos.row, column: pos.column});
-                    sel.clearSelection();
-                }
-                editor.$handlesEmacsOnCopy = false;
-                if (editor.inMultiSelectMode) editor.forEachSelection({exec: deselect});
-                else deselect();
-                editor.session.$emacsMarkRing = marks.concat(deselectedMarks.reverse());
+                var sel = editor.selection,
+                    range = sel.getRange();
+                editor.pushEmacsMark(sel.isBackwards() ? range.end : range.start);
+                sel.clearSelection();
            }, 0);
        },
        readOnly: true
@ -613,7 +570,6 @@ exports.handler.addCommands({
    keyboardQuit: function(editor) {
        editor.selection.clearSelection();
        editor.setEmacsMark(null);
-        editor.keyBinding.$data.count = null;
    },
    focusCommandLine: function(editor, arg) {
        if (editor.showCommandLine)
--- a/lib/ace/keyboard/emacs_test.js
+++ b/lib/ace/keyboard/emacs_test.js
@ -35,29 +35,17 @@ if (typeof process !== "undefined") {
 define(function(require, exports, module) {
 "use strict";

-require("../multi_select");
-
 var EditSession = require("./../edit_session").EditSession,
    Editor = require("./../editor").Editor,
-    Range = require("./../range").Range,
    MockRenderer = require("./../test/mockrenderer").MockRenderer,
    emacs = require('./emacs'),
    assert = require("./../test/assertions"),
-    editor, sel;
+    editor;

 function initEditor(docString) {
    var doc = new EditSession(docString.split("\n"));
    editor = new Editor(new MockRenderer(), doc);
    editor.setKeyboardHandler(emacs.handler);
-    sel = editor.selection;
-}
-
-function print(obj) {
-    return JSON.stringify(obj, null, 2);
-}
-
-function pluck(arr, what) {
-    return arr.map(function(ea) { return ea[what]; });
 }

 module.exports = {
@ -74,72 +62,6 @@ module.exports = {
        editor.selectAll();
        editor.execCommand('keyboardQuit');
        assert.ok(editor.selection.isEmpty(), 'selection non-empty');
-    },
-
-    "test: exchangePointAndMark without mark set": function() {
-        initEditor('foo');
-        sel.setRange(Range.fromPoints({row: 0, column: 1}, {row: 0, column: 3}));
-        editor.execCommand('exchangePointAndMark');
-        assert.deepEqual({row: 0, column: 1}, editor.getCursorPosition(), print(editor.getCursorPosition()));
-    },
-
-    "test: exchangePointAndMark with mark set": function() {
-        initEditor('foo');
-        editor.pushEmacsMark({row: 0, column: 1});
-        editor.pushEmacsMark({row: 0, column: 2});
-        editor.execCommand('exchangePointAndMark', {count: 4});
-        assert.deepEqual({row: 0, column: 2}, editor.getCursorPosition(), print(editor.getCursorPosition()));
-        assert.deepEqual([{row: 0, column: 1}, {row: 0, column: 0}], editor.session.$emacsMarkRing, print(editor.session.$emacsMarkRing));
-    },
-
-    "test: exchangePointAndMark with selection": function() {
-        initEditor('foo');
-        editor.pushEmacsMark({row: 0, column: 1});
-        editor.pushEmacsMark({row: 0, column: 2});
-        sel.setRange(Range.fromPoints({row: 0, column: 0}, {row: 0, column: 1}), true);
-        editor.execCommand('exchangePointAndMark');
-        assert.deepEqual({row: 0, column: 1}, editor.getCursorPosition(), print(editor.getCursorPosition()));
-        assert.deepEqual([{row: 0, column: 1}, {row: 0, column: 2}], editor.session.$emacsMarkRing, print(editor.session.$emacsMarkRing));
-    },
-
-    "test: exchangePointAndMark with multi selection": function() {
-        initEditor('foo\nhello world\n123');
-        var ranges = [[{row: 0, column: 0}, {row: 0, column: 3}],
-                      [{row: 1, column: 0}, {row: 1, column: 5}],
-                      [{row: 1, column: 6}, {row: 1, column: 11}]]
-        ranges.forEach(function(r) {
-            sel.addRange(Range.fromPoints(r[0], r[1]));
-        });
-        assert.equal("foo\nhello\nworld", editor.getSelectedText());
-        editor.execCommand('exchangePointAndMark');
-        assert.equal("foo\nhello\nworld", editor.getSelectedText());
-        assert.deepEqual(pluck(ranges, 0), pluck(sel.getAllRanges(), 'cursor'), "selections dir not inverted");
-    },
-
-    "test: exchangePointAndMark with multi cursors": function() {
-        initEditor('foo\nhello world\n123');
-        var ranges = [[{row: 0, column: 0}, {row: 0, column: 3}],
-                      [{row: 1, column: 0}, {row: 1, column: 5}],
-                      [{row: 1, column: 6}, {row: 1, column: 11}]];
-        // move cursors to the start of each range and set a mark to its end
-        // without selecting anything
-        ranges.forEach(function(r) {
-            editor.pushEmacsMark(r[1]);
-            sel.addRange(Range.fromPoints(r[0], r[0]));
-        });
-        assert.deepEqual(pluck(ranges, 0), pluck(sel.getAllRanges(), 'cursor'), print(sel.getAllRanges()));
-        editor.execCommand('exchangePointAndMark');
-        assert.deepEqual(pluck(ranges, 1), pluck(sel.getAllRanges(), 'cursor'), "not inverted: " + print(sel.getAllRanges()));
-    },
-
-    "test: setMark with multi cursors": function() {
-        initEditor('foo\nhello world\n123');
-        var positions = [{row: 0, column: 0},
-                         {row: 1, column: 0},
-                         {row: 1, column: 6}];
-        positions.forEach(function(p) { sel.addRange(Range.fromPoints(p,p)); });
-        editor.execCommand('setMark');
-        assert.deepEqual(positions, editor.session.$emacsMarkRing, print(editor.session.$emacsMarkRing));
    }

 };
--- a/lib/ace/keyboard/hash_handler.js
+++ b/lib/ace/keyboard/hash_handler.js
@ -87,12 +87,9 @@ MultiHashHandler.prototype = HashHandler.prototype;
        }
    };

-    this.bindKey = function(key, command, position) {
-        if (typeof key == "object") {
-            if (position == undefined)
-                position = key.position;
+    this.bindKey = function(key, command, asDefault) {
+        if (typeof key == "object")
            key = key[this.platform];
-        }
        if (!key)
            return;
        if (typeof command == "function")
@ -113,15 +110,11 @@ MultiHashHandler.prototype = HashHandler.prototype;
            }
            var binding = this.parseKeys(keyPart);
            var id = KEY_MODS[binding.hashId] + binding.key;
-            this._addCommandToBinding(chain + id, command, position);
+            this._addCommandToBinding(chain + id, command, asDefault);
        }, this);
    };
    
-    function getPosition(command) {
-        return typeof command == "object" && command.bindKey
-            && command.bindKey.position || 0;
-    }
-    this._addCommandToBinding = function(keyId, command, position) {
+    this._addCommandToBinding = function(keyId, command, asDefault) {
        var ckb = this.commandKeyBinding, i;
        if (!command) {
            delete ckb[keyId];
@ -133,21 +126,11 @@ MultiHashHandler.prototype = HashHandler.prototype;
            } else if ((i = ckb[keyId].indexOf(command)) != -1) {
                ckb[keyId].splice(i, 1);
            }
-
-            if (typeof position != "number") {
-                if (position || command.isDefault)
-                    position = -100;
-                else
-                   position = getPosition(command);
-            }
-            var commands = ckb[keyId];
-            for (i = 0; i < commands.length; i++) {
-                var other = commands[i];
-                var otherPos = getPosition(other);
-                if (otherPos > position)
-                    break;
-            }
-            commands.splice(i, 0, command);
+            
+            if (asDefault || command.isDefault)
+                ckb[keyId].unshift(command);
+            else
+                ckb[keyId].push(command);
        }
    };

@ -236,18 +219,10 @@ MultiHashHandler.prototype = HashHandler.prototype;
            }
        }
        
-        if (data.$keyChain) {
-            if ((!hashId || hashId == 4) && keyString.length == 1)
-                data.$keyChain = data.$keyChain.slice(0, -key.length - 1); // wait for input
-            else if (hashId == -1 || keyCode > 0)
-                data.$keyChain = ""; // reset keyChain
-        }
+        if (data.$keyChain && keyCode > 0)
+            data.$keyChain = "";
        return {command: command};
    };
-    
-    this.getStatusText = function(editor, data) {
-        return data.$keyChain || "";
-    };

 }).call(HashHandler.prototype);

--- a/lib/ace/keyboard/keybinding.js
+++ b/lib/ace/keyboard/keybinding.js
@ -89,16 +89,8 @@ var KeyBinding = function(editor) {
    this.getKeyboardHandler = function() {
        return this.$handlers[this.$handlers.length - 1];
    };
-    
-    this.getStatusText = function() {
-        var data = this.$data;
-        var editor = data.editor;
-        return this.$handlers.map(function(h) {
-            return h.getStatusText && h.getStatusText(editor, data) || "";
-        }).filter(Boolean).join(" ");
-    };

-    this.$callKeyboardHandlers = function(hashId, keyString, keyCode, e) {
+    this.$callKeyboardHandlers = function (hashId, keyString, keyCode, e) {
        var toExecute;
        var success = false;
        var commands = this.$editor.commands;
--- a/lib/ace/keyboard/textinput.js
+++ b/lib/ace/keyboard/textinput.js
@ -45,13 +45,13 @@ var TextInput = function(parentNode, host) {
    if (useragent.isTouchPad)
        text.setAttribute("x-palm-disable-auto-cap", true);

-    text.setAttribute("wrap", "off");
-    text.setAttribute("autocorrect", "off");
-    text.setAttribute("autocapitalize", "off");
-    text.setAttribute("spellcheck", false);
+    text.wrap = "off";
+    text.autocorrect = "off";
+    text.autocapitalize = "off";
+    text.spellcheck = false;

    text.style.opacity = "0";
-    if (useragent.isOldIE) text.style.top = "-1000px";
+    if (useragent.isOldIE) text.style.top = "-100px";
    parentNode.insertBefore(text, parentNode.firstChild);

    var PLACEHOLDER = "\x01\x01";
@ -75,15 +75,7 @@ var TextInput = function(parentNode, host) {
        host.onFocus(e);
        resetSelection();
    });
-    this.focus = function() {
-        if (tempStyle) return text.focus();
-        text.style.position = "fixed";
-        text.style.top = "-1000px";
-        text.focus();
-        setTimeout(function() {
-            text.style.position = "";
-        }, 0);
-    };
+    this.focus = function() { text.focus(); };
    this.blur = function() { text.blur(); };
    this.isFocused = function() {
        return isFocused;
@ -103,11 +95,6 @@ var TextInput = function(parentNode, host) {
    function resetSelection(isEmpty) {
        if (inComposition)
            return;
-        
-        // this prevents infinite recursion on safari 8 
-        // see https://github.com/ajaxorg/ace/issues/2114
-        inComposition = true;
-        
        if (inputHandler) {
            selectionStart = 0;
            selectionEnd = isEmpty ? 0 : text.value.length - 1;
@ -119,8 +106,6 @@ var TextInput = function(parentNode, host) {
        try {
            text.setSelectionRange(selectionStart, selectionEnd);
        } catch(e){}
-        
-        inComposition = false;
    }

    function resetValue() {
@ -306,7 +291,7 @@ var TextInput = function(parentNode, host) {
        var data = handleClipboardData(e);
        if (typeof data == "string") {
            if (data)
-                host.onPaste(data, e);
+                host.onPaste(data);
            if (useragent.isIE)
                setTimeout(resetSelection);
            event.preventDefault(e);
--- a/lib/ace/keyboard/vim.js
+++ b/lib/ace/keyboard/vim.js
--- a/lib/ace/keyboard/vim/commands.js
+++ b/lib/ace/keyboard/vim/commands.js
@ -0,0 +1,618 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Distributed under the BSD license:
+ *
+ * Copyright (c) 2010, Ajax.org B.V.
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Ajax.org B.V. nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * ***** END LICENSE BLOCK ***** */
+ 
+define(function(require, exports, module) {
+
+"never use strict";
+
+var lang = require("../../lib/lang");
+var util = require("./maps/util");
+var motions = require("./maps/motions");
+var operators = require("./maps/operators");
+var alias = require("./maps/aliases");
+var registers = require("./registers");
+
+var NUMBER = 1;
+var OPERATOR = 2;
+var MOTION = 3;
+var ACTION = 4;
+var HMARGIN = 8; // Minimum amount of line separation between margins;
+
+var repeat = function repeat(fn, count, args) {
+    while (0 < count--)
+        fn.apply(this, args);
+};
+
+var ensureScrollMargin = function(editor) {
+    var renderer = editor.renderer;
+    var pos = renderer.$cursorLayer.getPixelPosition();
+
+    var top = pos.top;
+
+    var margin = HMARGIN * renderer.layerConfig.lineHeight;
+    if (2 * margin > renderer.$size.scrollerHeight)
+        margin = renderer.$size.scrollerHeight / 2;
+
+    if (renderer.scrollTop > top - margin) {
+        renderer.session.setScrollTop(top - margin);
+    }
+
+    if (renderer.scrollTop + renderer.$size.scrollerHeight < top + margin + renderer.lineHeight) {
+        renderer.session.setScrollTop(top + margin + renderer.lineHeight - renderer.$size.scrollerHeight);
+    }
+};
+
+var actions = exports.actions = {
+    "z": {
+        param: true,
+        fn: function(editor, range, count, param) {
+            switch (param) {
+                case "z":
+                    editor.renderer.alignCursor(null, 0.5);
+                    break;
+                case "t":
+                    editor.renderer.alignCursor(null, 0);
+                    break;
+                case "b":
+                    editor.renderer.alignCursor(null, 1);
+                    break;
+                case "c":
+                    editor.session.onFoldWidgetClick(range.start.row, {domEvent:{target :{}}});
+                    break;
+                case "o":
+                    editor.session.onFoldWidgetClick(range.start.row, {domEvent:{target :{}}});
+                    break;
+                case "C":
+                    editor.session.foldAll();
+                    break;
+                case "O":
+                    editor.session.unfold();
+                    break;
+            }
+        }
+    },
+    "r": {
+        param: true,
+        fn: function(editor, range, count, param) {
+            if (param && param.length) {
+                if (param.length > 1)
+                    param = param == "return" ? "\n" : param == "tab" ? "\t" : param;
+                repeat(function() { editor.insert(param); }, count || 1);
+                editor.navigateLeft();
+            }
+        }
+    },
+    "R": {
+        fn: function(editor, range, count, param) {
+            util.insertMode(editor);
+            editor.setOverwrite(true);
+        }
+    },
+    "~": {
+        fn: function(editor, range, count) {
+            repeat(function() {
+                var range = editor.selection.getRange();
+                if (range.isEmpty())
+                    range.end.column++;
+                var text = editor.session.getTextRange(range);
+                var toggled = text.toUpperCase();
+                if (toggled != text)
+                    editor.session.replace(range, toggled);
+                else if (text.toLowerCase() != text)
+                    editor.session.replace(range, text.toLowerCase())
+                else
+                    editor.navigateRight();
+            }, count || 1);
+        }
+    },
+    "*": {
+        fn: function(editor, range, count, param) {
+            editor.selection.selectWord();
+            editor.findNext();
+            ensureScrollMargin(editor);
+            var r = editor.selection.getRange();
+            editor.selection.setSelectionRange(r, true);
+        }
+    },
+    "#": {
+        fn: function(editor, range, count, param) {
+            editor.selection.selectWord();
+            editor.findPrevious();
+            ensureScrollMargin(editor);
+            var r = editor.selection.getRange();
+            editor.selection.setSelectionRange(r, true);
+        }
+    },
+    "m": {
+        param: true,
+        fn: function(editor, range, count, param) {
+            var s =  editor.session;
+            var markers = s.vimMarkers || (s.vimMarkers = {});
+            var c = editor.getCursorPosition();
+            if (!markers[param]) {
+                markers[param] = editor.session.doc.createAnchor(c);
+            }
+            markers[param].setPosition(c.row, c.column, true);
+        }
+    },
+    "n": {
+        fn: function(editor, range, count, param) {
+            var options = editor.getLastSearchOptions();
+            options.backwards = false;
+            options.start = null;
+
+            editor.selection.moveCursorRight();
+            editor.selection.clearSelection();
+            editor.findNext(options);
+
+            ensureScrollMargin(editor);
+            var r = editor.selection.getRange();
+            r.end.row = r.start.row;
+            r.end.column = r.start.column;
+            editor.selection.setSelectionRange(r, true);
+        }
+    },
+    "N": {
+        fn: function(editor, range, count, param) {
+            var options = editor.getLastSearchOptions();
+            options.backwards = true;
+            options.start = null;
+
+            editor.findPrevious(options);
+            ensureScrollMargin(editor);
+            var r = editor.selection.getRange();
+            r.end.row = r.start.row;
+            r.end.column = r.start.column;
+            editor.selection.setSelectionRange(r, true);
+        }
+    },
+    "v": {
+        fn: function(editor, range, count, param) {
+            editor.selection.selectRight();
+            util.visualMode(editor, false);
+        },
+        acceptsMotion: true
+    },
+    "V": {
+        fn: function(editor, range, count, param) {
+            //editor.selection.selectLine();
+            //editor.selection.selectLeft();
+            var row = editor.getCursorPosition().row;
+            editor.selection.moveTo(row, 0);
+            editor.selection.selectLineEnd();
+            editor.selection.visualLineStart = row;
+
+            util.visualMode(editor, true);
+        },
+        acceptsMotion: true
+    },
+    "Y": {
+        fn: function(editor, range, count, param) {
+            util.copyLine(editor);
+        }
+    },
+    "p": {
+        fn: function(editor, range, count, param) {
+            var defaultReg = registers._default;
+
+            editor.setOverwrite(false);
+            if (defaultReg.isLine) {
+                var pos = editor.getCursorPosition();
+                pos.column = editor.session.getLine(pos.row).length;
+                var text = lang.stringRepeat("\n" + defaultReg.text, count || 1);
+                editor.session.insert(pos, text);
+                editor.moveCursorTo(pos.row + 1, 0);
+            }
+            else {
+                editor.navigateRight();
+                editor.insert(lang.stringRepeat(defaultReg.text, count || 1));
+                editor.navigateLeft();
+            }
+            editor.setOverwrite(true);
+            editor.selection.clearSelection();
+        }
+    },
+    "P": {
+        fn: function(editor, range, count, param) {
+            var defaultReg = registers._default;
+            editor.setOverwrite(false);
+
+            if (defaultReg.isLine) {
+                var pos = editor.getCursorPosition();
+                pos.column = 0;
+                var text = lang.stringRepeat(defaultReg.text + "\n", count || 1);
+                editor.session.insert(pos, text);
+                editor.moveCursorToPosition(pos);
+            }
+            else {
+                editor.insert(lang.stringRepeat(defaultReg.text, count || 1));
+            }
+            editor.setOverwrite(true);
+            editor.selection.clearSelection();
+        }
+    },
+    "J": {
+        fn: function(editor, range, count, param) {
+            var session = editor.session;
+            range = editor.getSelectionRange();
+            var pos = {row: range.start.row, column: range.start.column};
+            count = count || range.end.row - range.start.row;
+            var maxRow = Math.min(pos.row + (count || 1), session.getLength() - 1);
+
+            range.start.column = session.getLine(pos.row).length;
+            range.end.column = session.getLine(maxRow).length;
+            range.end.row = maxRow;
+
+            var text = "";
+            for (var i = pos.row; i < maxRow; i++) {
+                var nextLine = session.getLine(i + 1);
+                text += " " + /^\s*(.*)$/.exec(nextLine)[1] || "";
+            }
+
+            session.replace(range, text);
+            editor.moveCursorTo(pos.row, pos.column);
+        }
+    },
+    "u": {
+        fn: function(editor, range, count, param) {
+            count = parseInt(count || 1, 10);
+            for (var i = 0; i < count; i++) {
+                editor.undo();
+            }
+            editor.selection.clearSelection();
+        }
+    },
+    "ctrl-r": {
+        fn: function(editor, range, count, param) {
+            count = parseInt(count || 1, 10);
+            for (var i = 0; i < count; i++) {
+                editor.redo();
+            }
+            editor.selection.clearSelection();
+        }
+    },
+    ":": {
+        fn: function(editor, range, count, param) {
+            var val = ":";
+            if (count > 1)
+                val = ".,.+" + count + val;
+            if (editor.showCommandLine)
+                editor.showCommandLine(val);
+        }
+    },
+    "/": {
+        fn: function(editor, range, count, param) {
+            if (editor.showCommandLine)
+                editor.showCommandLine("/");
+        }
+    },
+    "?": {
+        fn: function(editor, range, count, param) {
+            if (editor.showCommandLine)
+                editor.showCommandLine("?");
+        }
+    },
+    ".": {
+        fn: function(editor, range, count, param) {
+            util.onInsertReplaySequence = inputBuffer.lastInsertCommands;
+            var previous = inputBuffer.previous;
+            if (previous) // If there is a previous action
+                inputBuffer.exec(editor, previous.action, previous.param);
+        }
+    },
+    "ctrl-x": {
+        fn: function(editor, range, count, param) {
+            editor.modifyNumber(-(count || 1));
+        }
+    },
+    "ctrl-a": {
+        fn: function(editor, range, count, param) {
+            editor.modifyNumber(count || 1);
+        }
+    }
+};
+
+var inputBuffer = exports.inputBuffer = {
+    accepting: [NUMBER, OPERATOR, MOTION, ACTION],
+    currentCmd: null,
+    //currentMode: 0,
+    currentCount: "",
+    pendingCount: "",
+    status: "",
+
+    // Types
+    operator: null,
+    motion: null,
+
+    lastInsertCommands: [],
+
+    push: function(editor, ch, keyId) {
+        var status = this.status;
+        var isKeyHandled = true;
+        this.idle = false;
+        var wObj = this.waitingForParam;
+        if (/^numpad\d+$/i.test(ch))
+            ch = ch.substr(6);
+            
+        if (wObj) {
+            this.exec(editor, wObj, ch);
+        }
+        // If input is a number (that doesn't start with 0)
+        else if (!(ch === "0" && !this.currentCount.length) &&
+            (/^\d+$/.test(ch) && this.isAccepting(NUMBER))) {
+            // Assuming that ch is always of type String, and not Number
+            this.currentCount += ch;
+            this.currentCmd = NUMBER;
+            this.accepting = [NUMBER, OPERATOR, MOTION, ACTION];
+        }
+        else if (!this.operator && this.isAccepting(OPERATOR) && operators[ch]) {
+            this.operator = {
+                ch: ch,
+                count: this.getCount()
+            };
+            this.currentCmd = OPERATOR;
+            this.accepting = [NUMBER, MOTION, ACTION];
+            this.exec(editor, { operator: this.operator });
+        }
+        else if (motions[ch] && this.isAccepting(MOTION)) {
+            this.currentCmd = MOTION;
+
+            var ctx = {
+                operator: this.operator,
+                motion: {
+                    ch: ch,
+                    count: this.getCount()
+                }
+            };
+
+            if (motions[ch].param)
+                this.waitForParam(ctx);
+            else
+                this.exec(editor, ctx);
+        }
+        else if (alias[ch] && this.isAccepting(MOTION)) {
+            alias[ch].operator.count = this.getCount();
+            this.exec(editor, alias[ch]);
+        }
+        else if (actions[ch] && this.isAccepting(ACTION)) {
+            var actionObj = {
+                action: {
+                    fn: actions[ch].fn,
+                    count: this.getCount()
+                }
+            };
+
+            if (actions[ch].param) {
+                this.waitForParam(actionObj);
+            }
+            else {
+                this.exec(editor, actionObj);
+            }
+
+            if (actions[ch].acceptsMotion)
+                this.idle = false;
+        }
+        else if (this.operator) {
+            this.operator.count = this.getCount();
+            this.exec(editor, { operator: this.operator }, ch);
+        }
+        else {
+            isKeyHandled = ch.length == 1;
+            this.reset();
+        }
+        
+        if (this.waitingForParam || this.motion || this.operator) {
+            this.status += ch;
+        } else if (this.currentCount) {
+            this.status = this.currentCount;
+        } else if (this.status) {
+            this.status = "";
+        }
+        if (this.status != status)
+            editor._emit("changeStatus");
+        return isKeyHandled;
+    },
+
+    waitForParam: function(cmd) {
+        this.waitingForParam = cmd;
+    },
+
+    getCount: function() {
+        var count = this.currentCount || this.pendingCount;
+        this.currentCount = "";
+        this.pendingCount = count;
+        return count && parseInt(count, 10);
+    },
+
+    exec: function(editor, action, param) {
+        var m = action.motion;
+        var o = action.operator;
+        var a = action.action;
+
+        if (!param)
+            param = action.param;
+
+        if (o) {
+            this.previous = {
+                action: action,
+                param: param
+            };
+        }
+
+        if (o && !editor.selection.isEmpty()) {
+            if (operators[o.ch].selFn) {
+                operators[o.ch].selFn(editor, editor.getSelectionRange(), o.count, param);
+                this.reset();
+            }
+            return;
+        }
+
+        // There is an operator, but no motion or action. We try to pass the
+        // current ch to the operator to see if it responds to it (an example
+        // of this is the 'dd' operator).
+        else if (!m && !a && o && param) {
+            operators[o.ch].fn(editor, null, o.count, param);
+            this.reset();
+        }
+        else if (m) {
+            var run = function(fn) {
+                if (fn && typeof fn === "function") { // There should always be a motion
+                    if (m.count && !motionObj.handlesCount)
+                        repeat(fn, m.count, [editor, null, m.count, param]);
+                    else
+                        fn(editor, null, m.count, param);
+                }
+            };
+
+            var motionObj = motions[m.ch];
+            var selectable = motionObj.sel;
+
+            if (!o) {
+                if ((util.onVisualMode || util.onVisualLineMode) && selectable)
+                    run(motionObj.sel);
+                else
+                    run(motionObj.nav);
+            }
+            else if (selectable) {
+                repeat(function() {
+                    run(motionObj.sel);
+                    operators[o.ch].fn(editor, editor.getSelectionRange(), 
+                        o.count, motionObj.param ? motionObj : param);
+                }, o.count || 1);
+            }
+            this.reset();
+        }
+        else if (a) {
+            a.fn(editor, editor.getSelectionRange(), a.count, param);
+            this.reset();
+        }
+        handleCursorMove(editor);
+    },
+
+    isAccepting: function(type) {
+        return this.accepting.indexOf(type) !== -1;
+    },
+
+    reset: function() {
+        this.operator = null;
+        this.motion = null;
+        this.currentCount = "";
+        this.pendingCount = "";
+        this.status = "";
+        this.accepting = [NUMBER, OPERATOR, MOTION, ACTION];
+        this.idle = true;
+        this.waitingForParam = null;
+    }
+};
+
+function setPreviousCommand(fn) {
+    inputBuffer.previous = { action: { action: { fn: fn } } };
+}
+
+exports.coreCommands = {
+    start: {
+        exec: function start(editor) {
+            util.insertMode(editor);
+            setPreviousCommand(start);
+        }
+    },
+    startBeginning: {
+        exec: function startBeginning(editor) {
+            editor.navigateLineStart();
+            util.insertMode(editor);
+            setPreviousCommand(startBeginning);
+        }
+    },
+    // Stop Insert mode as soon as possible. Works like typing <Esc> in
+    // insert mode.
+    stop: {
+        exec: function stop(editor) {
+            inputBuffer.reset();
+            util.onVisualMode = false;
+            util.onVisualLineMode = false;
+            inputBuffer.lastInsertCommands = util.normalMode(editor);
+        }
+    },
+    append: {
+        exec: function append(editor) {
+            var pos = editor.getCursorPosition();
+            var lineLen = editor.session.getLine(pos.row).length;
+            if (lineLen)
+                editor.navigateRight();
+            util.insertMode(editor);
+            setPreviousCommand(append);
+        }
+    },
+    appendEnd: {
+        exec: function appendEnd(editor) {
+            editor.navigateLineEnd();
+            util.insertMode(editor);
+            setPreviousCommand(appendEnd);
+        }
+    }
+};
+
+var handleCursorMove = exports.onCursorMove = function(editor, e) {
+    if (util.currentMode === 'insert' || handleCursorMove.running)
+        return;
+    else if(!editor.selection.isEmpty()) {
+        handleCursorMove.running = true;
+        if (util.onVisualLineMode) {
+            var originRow = editor.selection.visualLineStart;
+            var cursorRow = editor.getCursorPosition().row;
+            if(originRow <= cursorRow) {
+                var endLine = editor.session.getLine(cursorRow);
+                editor.selection.moveTo(originRow, 0);
+                editor.selection.selectTo(cursorRow, endLine.length);
+            } else {
+                var endLine = editor.session.getLine(originRow);
+                editor.selection.moveTo(originRow, endLine.length);
+                editor.selection.selectTo(cursorRow, 0);
+            }
+        }
+        handleCursorMove.running = false;
+        return;
+    }
+    else {
+        if (e && (util.onVisualLineMode || util.onVisualMode)) {
+            editor.selection.clearSelection();
+            util.normalMode(editor);
+        }
+
+        handleCursorMove.running = true;
+        var pos = editor.getCursorPosition();
+        var lineLen = editor.session.getLine(pos.row).length;
+
+        if (lineLen && pos.column === lineLen)
+            editor.navigateLeft();
+        handleCursorMove.running = false;
+    }
+};
+});
--- a/lib/ace/keyboard/vim/maps/aliases.js
+++ b/lib/ace/keyboard/vim/maps/aliases.js
@ -27,36 +27,68 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *
 * ***** END LICENSE BLOCK ***** */
+ 
+"use strict"

 define(function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var SqlServerHighlightRules = require("./sqlserver_highlight_rules").SqlHighlightRules;
-var Range = require("../range").Range;
-var SqlServerFoldMode = require("./folding/sqlserver").FoldMode;
-
-var Mode = function() {
-    this.HighlightRules = SqlServerHighlightRules;
-    this.foldingRules = new SqlServerFoldMode();
+module.exports = {
+    "x": {
+        operator: {
+            ch: "d",
+            count: 1
+        },
+        motion: {
+            ch: "l",
+            count: 1
+        }
+    },
+    "X": {
+        operator: {
+            ch: "d",
+            count: 1
+        },
+        motion: {
+            ch: "h",
+            count: 1
+        }
+    },
+    "D": {
+        operator: {
+            ch: "d",
+            count: 1
+        },
+        motion: {
+            ch: "$",
+            count: 1
+        }
+    },
+    "C": {
+        operator: {
+            ch: "c",
+            count: 1
+        },
+        motion: {
+            ch: "$",
+            count: 1
+        }
+    },
+    "s": {
+        operator: {
+            ch: "c",
+            count: 1
+        },
+        motion: {
+            ch: "l",
+            count: 1
+        }
+    },
+    "S": {
+        operator: {
+            ch: "c",
+            count: 1
+        },
+        param: "c"
+    }
 };
-oop.inherits(Mode, TextMode);
-
-(function() {
-    this.lineCommentStart = "--";
-    this.blockComment = {start: "/*", end: "*/"};
-    
-    /**
-     * Override keyword completions using list created in highlight rules
-     */
-    this.getCompletions = function(state, session, pos, prefix) {
-        return session.$mode.$highlightRules.completions;
-    };
-    
-    this.$id = "ace/mode/sql";
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-
 });
+
--- a/lib/ace/keyboard/vim/maps/motions.js
+++ b/lib/ace/keyboard/vim/maps/motions.js
@ -0,0 +1,681 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Distributed under the BSD license:
+ *
+ * Copyright (c) 2010, Ajax.org B.V.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Ajax.org B.V. nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+
+define(function(require, exports, module) {
+"use strict";
+
+var util = require("./util");
+
+var keepScrollPosition = function(editor, fn) {
+    var scrollTopRow = editor.renderer.getScrollTopRow();
+    var initialRow = editor.getCursorPosition().row;
+    var diff = initialRow - scrollTopRow;
+    fn && fn.call(editor);
+    editor.renderer.scrollToRow(editor.getCursorPosition().row - diff);
+};
+
+function Motion(m) {
+    if (typeof m == "function") {
+        var getPos = m;
+        m = this;
+    } else {
+        var getPos = m.getPos;
+    }
+    m.nav = function(editor, range, count, param) {
+        var a = getPos(editor, range, count, param, false);
+        if (!a)
+            return;
+        editor.selection.moveTo(a.row, a.column);
+    };
+    m.sel = function(editor, range, count, param) {
+        var a = getPos(editor, range, count, param, true);
+        if (!a)
+            return;
+        editor.selection.selectTo(a.row, a.column);
+    };
+    return m;
+}
+
+var nonWordRe = /[\s.\/\\()\"'-:,.;<>~!@#$%^&*|+=\[\]{}`~?]/;
+var wordSeparatorRe = /[.\/\\()\"'-:,.;<>~!@#$%^&*|+=\[\]{}`~?]/;
+var whiteRe = /\s/;
+var StringStream = function(editor, cursor) {
+    var sel = editor.selection;
+    this.range = sel.getRange();
+    cursor = cursor || sel.selectionLead;
+    this.row = cursor.row;
+    this.col = cursor.column;
+    var line = editor.session.getLine(this.row);
+    var maxRow = editor.session.getLength();
+    this.ch = line[this.col] || '\n';
+    this.skippedLines = 0;
+
+    this.next = function() {
+        this.ch = line[++this.col] || this.handleNewLine(1);
+        //this.debug()
+        return this.ch;
+    };
+    this.prev = function() {
+        this.ch = line[--this.col] || this.handleNewLine(-1);
+        //this.debug()
+        return this.ch;
+    };
+    this.peek = function(dir) {
+        var ch = line[this.col + dir];
+        if (ch)
+            return ch;
+        if (dir == -1)
+            return '\n';
+        if (this.col == line.length - 1)
+            return '\n';
+        return editor.session.getLine(this.row + 1)[0] || '\n';
+    };
+
+    this.handleNewLine = function(dir) {
+        if (dir == 1){
+            if (this.col == line.length)
+                return '\n';
+            if (this.row == maxRow - 1)
+                return '';
+            this.col = 0;
+            this.row ++;
+            line = editor.session.getLine(this.row);
+            this.skippedLines++;
+            return line[0] || '\n';
+        }
+        if (dir == -1) {
+            if (this.row === 0)
+                return '';
+            this.row --;
+            line = editor.session.getLine(this.row);
+            this.col = line.length;
+            this.skippedLines--;
+            return '\n';
+        }
+    };
+    this.debug = function() {
+        console.log(line.substring(0, this.col)+'|'+this.ch+'\''+this.col+'\''+line.substr(this.col+1));
+    };
+};
+
+var Search = require("../../../search").Search;
+var search = new Search();
+
+function find(editor, needle, dir) {
+    search.$options.needle = needle;
+    search.$options.backwards = dir == -1;
+    return search.find(editor.session);
+}
+
+var Range = require("../../../range").Range;
+
+var LAST_SEARCH_MOTION = {};
+
+module.exports = {
+    "w": new Motion(function(editor) {
+        var str = new StringStream(editor);
+
+        if (str.ch && wordSeparatorRe.test(str.ch)) {
+            while (str.ch && wordSeparatorRe.test(str.ch))
+                str.next();
+        } else {
+            while (str.ch && !nonWordRe.test(str.ch))
+                str.next();
+        }
+        while (str.ch && whiteRe.test(str.ch) && str.skippedLines < 2)
+            str.next();
+
+        str.skippedLines == 2 && str.prev();
+        return {column: str.col, row: str.row};
+    }),
+    "W": new Motion(function(editor) {
+        var str = new StringStream(editor);
+        while(str.ch && !(whiteRe.test(str.ch) && !whiteRe.test(str.peek(1))) && str.skippedLines < 2)
+            str.next();
+        if (str.skippedLines == 2)
+            str.prev();
+        else
+            str.next();
+
+        return {column: str.col, row: str.row};
+    }),
+    "b": new Motion(function(editor) {
+        var str = new StringStream(editor);
+
+        str.prev();
+        while (str.ch && whiteRe.test(str.ch) && str.skippedLines > -2)
+            str.prev();
+
+        if (str.ch && wordSeparatorRe.test(str.ch)) {
+            while (str.ch && wordSeparatorRe.test(str.ch))
+                str.prev();
+        } else {
+            while (str.ch && !nonWordRe.test(str.ch))
+                str.prev();
+        }
+        str.ch && str.next();
+        return {column: str.col, row: str.row};
+    }),
+    "B": new Motion(function(editor) {
+        var str = new StringStream(editor);
+        str.prev();
+        while(str.ch && !(!whiteRe.test(str.ch) && whiteRe.test(str.peek(-1))) && str.skippedLines > -2)
+            str.prev();
+
+        if (str.skippedLines == -2)
+            str.next();
+
+        return {column: str.col, row: str.row};
+    }),
+    "e": new Motion(function(editor) {
+        var str = new StringStream(editor);
+
+        str.next();
+        while (str.ch && whiteRe.test(str.ch))
+            str.next();
+
+        if (str.ch && wordSeparatorRe.test(str.ch)) {
+            while (str.ch && wordSeparatorRe.test(str.ch))
+                str.next();
+        } else {
+            while (str.ch && !nonWordRe.test(str.ch))
+                str.next();
+        }
+        str.ch && str.prev();
+        return {column: str.col, row: str.row};
+    }),
+    "E": new Motion(function(editor) {
+        var str = new StringStream(editor);
+        str.next();
+        while(str.ch && !(!whiteRe.test(str.ch) && whiteRe.test(str.peek(1))))
+            str.next();
+
+        return {column: str.col, row: str.row};
+    }),
+
+    "l": {
+        nav: function(editor) {
+            var pos = editor.getCursorPosition();
+            var col = pos.column;
+            var lineLen = editor.session.getLine(pos.row).length;
+            if (lineLen && col !== lineLen)
+                editor.navigateRight();
+        },
+        sel: function(editor) {
+            var pos = editor.getCursorPosition();
+            var col = pos.column;
+            var lineLen = editor.session.getLine(pos.row).length;
+
+            // Solving the behavior at the end of the line due to the
+            // different 0 index-based colum positions in ACE.
+            if (lineLen && col !== lineLen) //In selection mode you can select the newline
+                editor.selection.selectRight();
+        }
+    },
+    "h": {
+        nav: function(editor) {
+            var pos = editor.getCursorPosition();
+            if (pos.column > 0)
+                editor.navigateLeft();
+        },
+        sel: function(editor) {
+            var pos = editor.getCursorPosition();
+            if (pos.column > 0)
+                editor.selection.selectLeft();
+        }
+    },
+    "H": {
+        nav: function(editor) {
+            var row = editor.renderer.getScrollTopRow();
+            editor.moveCursorTo(row);
+        },
+        sel: function(editor) {
+            var row = editor.renderer.getScrollTopRow();
+            editor.selection.selectTo(row);
+        }
+    },
+    "M": {
+        nav: function(editor) {
+            var topRow = editor.renderer.getScrollTopRow();
+            var bottomRow = editor.renderer.getScrollBottomRow();
+            var row = topRow + ((bottomRow - topRow) / 2);
+            editor.moveCursorTo(row);
+        },
+        sel: function(editor) {
+            var topRow = editor.renderer.getScrollTopRow();
+            var bottomRow = editor.renderer.getScrollBottomRow();
+            var row = topRow + ((bottomRow - topRow) / 2);
+            editor.selection.selectTo(row);
+        }
+    },
+    "L": {
+        nav: function(editor) {
+            var row = editor.renderer.getScrollBottomRow();
+            editor.moveCursorTo(row);
+        },
+        sel: function(editor) {
+            var row = editor.renderer.getScrollBottomRow();
+            editor.selection.selectTo(row);
+        }
+    },
+    "k": {
+        nav: function(editor) {
+            editor.navigateUp();
+        },
+        sel: function(editor) {
+            editor.selection.selectUp();
+        }
+    },
+    "j": {
+        nav: function(editor) {
+            editor.navigateDown();
+        },
+        sel: function(editor) {
+            editor.selection.selectDown();
+        }
+    },
+
+    "i": {
+        param: true,
+        sel: function(editor, range, count, param) {
+            switch (param) {
+                case "w":
+                    editor.selection.selectWord();
+                    break;
+                case "W":
+                    editor.selection.selectAWord();
+                    break;
+                case "(":
+                case "{":
+                case "[":
+                    var cursor = editor.getCursorPosition();
+                    var end = editor.session.$findClosingBracket(param, cursor, /paren/);
+                    if (!end)
+                        return;
+                    var start = editor.session.$findOpeningBracket(editor.session.$brackets[param], cursor, /paren/);
+                    if (!start)
+                        return;
+                    start.column ++;
+                    editor.selection.setSelectionRange(Range.fromPoints(start, end));
+                    break;
+                case "'":
+                case '"':
+                case "/":
+                    var end = find(editor, param, 1);
+                    if (!end)
+                        return;
+                    var start = find(editor, param, -1);
+                    if (!start)
+                        return;
+                    editor.selection.setSelectionRange(Range.fromPoints(start.end, end.start));
+                    break;
+            }
+        }
+    },
+    "a": {
+        param: true,
+        sel: function(editor, range, count, param) {
+            switch (param) {
+                case "w":
+                    editor.selection.selectAWord();
+                    break;
+                case "W":
+                    editor.selection.selectAWord();
+                    break;
+                case ")":
+                case "}":
+                case "]":
+                    param = editor.session.$brackets[param];
+                case "(":
+                case "{":
+                case "[":
+                    var cursor = editor.getCursorPosition();
+                    var end = editor.session.$findClosingBracket(param, cursor, /paren/);
+                    if (!end)
+                        return;
+                    var start = editor.session.$findOpeningBracket(editor.session.$brackets[param], cursor, /paren/);
+                    if (!start)
+                        return;
+                    end.column ++;
+                    editor.selection.setSelectionRange(Range.fromPoints(start, end));
+                    break;
+                case "'":
+                case "\"":
+                case "/":
+                    var end = find(editor, param, 1);
+                    if (!end)
+                        return;
+                    var start = find(editor, param, -1);
+                    if (!start)
+                        return;
+                    end.column ++;
+                    editor.selection.setSelectionRange(Range.fromPoints(start.start, end.end));
+                    break;
+            }
+        }
+    },
+
+    "f": new Motion({
+        param: true,
+        handlesCount: true,
+        getPos: function(editor, range, count, param, isSel, isRepeat) {
+            if (param == "space") param = " ";
+            if (!isRepeat)
+                LAST_SEARCH_MOTION = {ch: "f", param: param};
+            var cursor = editor.getCursorPosition();
+            var column = util.getRightNthChar(editor, cursor, param, count || 1);
+
+            if (typeof column === "number") {
+                cursor.column += column + (isSel ? 2 : 1);
+                return cursor;
+            }
+        }
+    }),
+    "F": new Motion({
+        param: true,
+        handlesCount: true,
+        getPos: function(editor, range, count, param, isSel, isRepeat) {
+            if (param == "space") param = " ";
+            if (!isRepeat)
+                LAST_SEARCH_MOTION = {ch: "F", param: param};
+            var cursor = editor.getCursorPosition();
+            var column = util.getLeftNthChar(editor, cursor, param, count || 1);
+
+            if (typeof column === "number") {
+                cursor.column -= column + 1;
+                return cursor;
+            }
+        }
+    }),
+    "t": new Motion({
+        param: true,
+        handlesCount: true,
+        getPos: function(editor, range, count, param, isSel, isRepeat) {
+            if (param == "space") param = " ";
+            if (!isRepeat)
+                LAST_SEARCH_MOTION = {ch: "t", param: param};
+            var cursor = editor.getCursorPosition();
+            var column = util.getRightNthChar(editor, cursor, param, count || 1);
+
+            if (isRepeat && column == 0 && !(count > 1))
+                column = util.getRightNthChar(editor, cursor, param, 2);
+                
+            if (typeof column === "number") {
+                cursor.column += column + (isSel ? 1 : 0);
+                return cursor;
+            }
+        }
+    }),
+    "T": new Motion({
+        param: true,
+        handlesCount: true,
+        getPos: function(editor, range, count, param, isSel, isRepeat) {
+            if (param == "space") param = " ";
+            if (!isRepeat)
+                LAST_SEARCH_MOTION = {ch: "T", param: param};
+            var cursor = editor.getCursorPosition();
+            var column = util.getLeftNthChar(editor, cursor, param, count || 1);
+
+            if (isRepeat && column === 0 && !(count > 1))
+                column = util.getLeftNthChar(editor, cursor, param, 2);
+            
+            if (typeof column === "number") {
+                cursor.column -= column;
+                return cursor;
+            }
+        }
+    }),
+    ";": new Motion({
+        handlesCount: true,
+        getPos: function(editor, range, count, param, isSel) {
+            var ch = LAST_SEARCH_MOTION.ch;
+            if (!ch)
+                return;
+            return module.exports[ch].getPos(
+                editor, range, count, LAST_SEARCH_MOTION.param, isSel, true
+            );
+        }
+    }),
+    ",": new Motion({
+        handlesCount: true,
+        getPos: function(editor, range, count, param, isSel) {
+            var ch = LAST_SEARCH_MOTION.ch;
+            if (!ch)
+                return;
+            var up = ch.toUpperCase();
+            ch = ch === up ? ch.toLowerCase() : up;
+            
+            return module.exports[ch].getPos(
+                editor, range, count, LAST_SEARCH_MOTION.param, isSel, true
+            );
+        }
+    }),
+
+    "^": {
+        nav: function(editor) {
+            editor.navigateLineStart();
+        },
+        sel: function(editor) {
+            editor.selection.selectLineStart();
+        }
+    },
+    "$": {
+        handlesCount: true,
+        nav: function(editor, range, count, param) {
+            if (count > 1) {
+                editor.navigateDown(count-1);
+            }
+            editor.navigateLineEnd();
+        },
+        sel: function(editor, range, count, param) {
+            if (count > 1) {
+                editor.selection.moveCursorBy(count-1, 0);
+            }
+            editor.selection.selectLineEnd();
+        }
+    },
+    "0": new Motion(function(ed) {
+        return {row: ed.selection.lead.row, column: 0};
+    }),
+    "G": {
+        nav: function(editor, range, count, param) {
+            if (!count && count !== 0) { // Stupid JS
+                count = editor.session.getLength();
+            }
+            editor.gotoLine(count);
+        },
+        sel: function(editor, range, count, param) {
+            if (!count && count !== 0) { // Stupid JS
+                count = editor.session.getLength();
+            }
+            editor.selection.selectTo(count, 0);
+        }
+    },
+    "g": {
+        param: true,
+        nav: function(editor, range, count, param) {
+            switch(param) {
+                case "m":
+                    console.log("Middle line");
+                    break;
+                case "e":
+                    console.log("End of prev word");
+                    break;
+                case "g":
+                    editor.gotoLine(count || 0);
+                case "u":
+                    editor.gotoLine(count || 0);
+                case "U":
+                    editor.gotoLine(count || 0);
+            }
+        },
+        sel: function(editor, range, count, param) {
+            switch(param) {
+                case "m":
+                    console.log("Middle line");
+                    break;
+                case "e":
+                    console.log("End of prev word");
+                    break;
+                case "g":
+                    editor.selection.selectTo(count || 0, 0);
+            }
+        }
+    },
+    "o": {
+        nav: function(editor, range, count, param) {
+            count = count || 1;
+            var content = "";
+            while (0 < count--)
+                content += "\n";
+
+            if (content.length) {
+                editor.navigateLineEnd();
+                editor.insert(content);
+                util.insertMode(editor);
+            }
+        }
+    },
+    "O": {
+        nav: function(editor, range, count, param) {
+            var row = editor.getCursorPosition().row;
+            count = count || 1;
+            var content = "";
+            while (0 < count--)
+                content += "\n";
+
+            if (content.length) {
+                if(row > 0) {
+                    editor.navigateUp();
+                    editor.navigateLineEnd();
+                    editor.insert(content);
+                } else {
+                    editor.session.insert({row: 0, column: 0}, content);
+                    editor.navigateUp();
+                }
+                util.insertMode(editor);
+            }
+        }
+    },
+    "%": new Motion(function(editor){
+        var brRe = /[\[\]{}()]/g;
+        var cursor = editor.getCursorPosition();
+        var ch = editor.session.getLine(cursor.row)[cursor.column];
+        if (!brRe.test(ch)) {
+            var range = find(editor, brRe);
+            if (!range)
+                return;
+            cursor = range.start;
+        }
+        var match = editor.session.findMatchingBracket({
+            row: cursor.row,
+            column: cursor.column + 1
+        });
+
+        return match;
+    }),
+    "{": new Motion(function(ed) {
+        var session = ed.session;
+        var row = session.selection.lead.row;
+        while(row > 0 && !/\S/.test(session.getLine(row)))
+            row--;
+        while(/\S/.test(session.getLine(row)))
+            row--;
+        return {column: 0, row: row};
+    }),
+    "}": new Motion(function(ed) {
+        var session = ed.session;
+        var l = session.getLength();
+        var row = session.selection.lead.row;
+        while(row < l && !/\S/.test(session.getLine(row)))
+            row++;
+        while(/\S/.test(session.getLine(row)))
+            row++;
+        return {column: 0, row: row};
+    }),
+    "ctrl-d": {
+        nav: function(editor, range, count, param) {
+            editor.selection.clearSelection();
+            keepScrollPosition(editor, editor.gotoPageDown);
+        },
+        sel: function(editor, range, count, param) {
+            keepScrollPosition(editor, editor.selectPageDown);
+        }
+    },
+    "ctrl-u": {
+        nav: function(editor, range, count, param) {
+            editor.selection.clearSelection();
+            keepScrollPosition(editor, editor.gotoPageUp);
+        },
+        sel: function(editor, range, count, param) {
+            keepScrollPosition(editor, editor.selectPageUp);
+        }
+    },
+    "`": new Motion({
+        param: true,
+        handlesCount: true,
+        getPos: function(editor, range, count, param, isSel) {
+            var s = editor.session;
+            var marker = s.vimMarkers && s.vimMarkers[param];
+            if (marker) {
+                return marker.getPosition();
+            }
+        }
+    }),
+    "'": new Motion({
+        param: true,
+        handlesCount: true,
+        getPos: function(editor, range, count, param, isSel) {
+            var s = editor.session;
+            var marker = s.vimMarkers && s.vimMarkers[param];
+            if (marker) {
+                var pos = marker.getPosition();
+                var line = editor.session.getLine(pos.row);                
+                pos.column = line.search(/\S/);
+                if (pos.column == -1)
+                    pos.column = line.length;
+                return pos;
+            }
+        },
+        isLine: true
+    })
+};
+
+module.exports.backspace = module.exports.left = module.exports.h;
+module.exports.space = module.exports['return'] = module.exports.right = module.exports.l;
+module.exports.up = module.exports.k;
+module.exports.down = module.exports.j;
+module.exports.pagedown = module.exports["ctrl-d"];
+module.exports.pageup = module.exports["ctrl-u"];
+module.exports.home = module.exports["0"];
+module.exports.end = module.exports["$"];
+
+});
--- a/lib/ace/keyboard/vim/maps/operators.js
+++ b/lib/ace/keyboard/vim/maps/operators.js
@ -0,0 +1,201 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Distributed under the BSD license:
+ *
+ * Copyright (c) 2010, Ajax.org B.V.
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Ajax.org B.V. nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * ***** END LICENSE BLOCK ***** */
+ 
+define(function(require, exports, module) {
+
+"use strict";
+
+var util = require("./util");
+var registers = require("../registers");
+var Range = require("../../../range").Range;
+
+module.exports = {
+    "d": {
+        selFn: function(editor, range, count, param) {
+            registers._default.text = editor.getCopyText();
+            registers._default.isLine = util.onVisualLineMode;
+            if(util.onVisualLineMode)
+                editor.removeLines();
+            else
+                editor.session.remove(range);
+            util.normalMode(editor);
+        },
+        fn: function(editor, range, count, param) {
+            count = count || 1;
+            switch (param) {
+                case "d":
+                    registers._default.text = "";
+                    registers._default.isLine = true;
+                    for (var i = 0; i < count; i++) {
+                        editor.selection.selectLine();
+                        registers._default.text += editor.getCopyText();
+                        var selRange = editor.getSelectionRange();
+                        // check if end of the document was reached
+                        if (!selRange.isMultiLine()) {
+                            var row = selRange.start.row - 1;
+                            var col = editor.session.getLine(row).length
+                            selRange.setStart(row, col);
+                            editor.session.remove(selRange);
+                            editor.selection.clearSelection();
+                            break;
+                        }
+                        editor.session.remove(selRange);
+                        editor.selection.clearSelection();
+                    }
+                    registers._default.text = registers._default.text.replace(/\n$/, "");
+                    break;
+                default:
+                    if (range) {
+                        editor.selection.setSelectionRange(range);
+                        registers._default.text = editor.getCopyText();
+                        registers._default.isLine = false;
+                        editor.session.remove(range);
+                        editor.selection.clearSelection();
+                    }
+            }
+        }
+    },
+    "c": {
+        selFn: function(editor, range, count, param) {
+            editor.session.remove(range);
+            util.insertMode(editor);
+        },
+        fn: function(editor, range, count, param) {
+            count = count || 1;
+            switch (param) {
+                case "c":
+                    editor.$blockScrolling++;
+                    editor.selection.$moveSelection(function() {
+                        editor.selection.moveCursorBy(count - 1, 0);
+                    });
+                    var rows = editor.$getSelectedRows();
+                    range = new Range(rows.first, 0, rows.last, Infinity);
+                    editor.session.remove(range);
+                    editor.$blockScrolling--;
+                    util.insertMode(editor);
+                    break;
+                default:
+                    if (range) {
+                        // range.end.column ++;
+                        editor.session.remove(range);
+                        util.insertMode(editor);
+                    }
+            }
+        }
+    },
+    "y": {
+        selFn: function(editor, range, count, param) {
+            registers._default.text = editor.getCopyText();
+            registers._default.isLine = util.onVisualLineMode;
+            editor.selection.clearSelection();
+            util.normalMode(editor);
+        },
+        fn: function(editor, range, count, param) {
+            count = count || 1;
+            if (param && param.isLine) 
+                param = "y";
+            switch (param) {
+                case "y":
+                    var pos = editor.getCursorPosition();
+                    editor.selection.selectLine();
+                    for (var i = 0; i < count - 1; i++) {
+                        editor.selection.moveCursorDown();
+                    }
+                    registers._default.text = editor.getCopyText().replace(/\n$/, "");
+                    editor.selection.clearSelection();
+                    registers._default.isLine = true;
+                    editor.moveCursorToPosition(pos);
+                    break;
+                default:
+                    if (range) {
+                        var pos = editor.getCursorPosition();
+                        editor.selection.setSelectionRange(range);
+                        registers._default.text = editor.getCopyText();
+                        registers._default.isLine = false;
+                        editor.selection.clearSelection();
+                        editor.moveCursorTo(pos.row, pos.column);
+                    }
+            }
+        }
+    },
+    ">": {
+        selFn: function(editor, range, count, param) {
+            count = count || 1;
+            for (var i = 0; i < count; i++) {
+                editor.indent();
+            }
+            util.normalMode(editor);
+        },
+        fn: function(editor, range, count, param) {
+            count = parseInt(count || 1, 10);
+            switch (param) {
+                case ">":
+                    var pos = editor.getCursorPosition();
+                    editor.selection.selectLine();
+                    for (var i = 0; i < count - 1; i++) {
+                        editor.selection.moveCursorDown();
+                    }
+                    editor.indent();
+                    editor.selection.clearSelection();
+                    editor.moveCursorToPosition(pos);
+                    editor.navigateLineEnd();
+                    editor.navigateLineStart();
+                    break;
+            }
+        }
+    },
+    "<": {
+        selFn: function(editor, range, count, param) {
+            count = count || 1;
+            for (var i = 0; i < count; i++) {
+                editor.blockOutdent();
+            }
+            util.normalMode(editor);
+        },
+        fn: function(editor, range, count, param) {
+            count = count || 1;
+            switch (param) {
+                case "<":
+                    var pos = editor.getCursorPosition();
+                    editor.selection.selectLine();
+                    for (var i = 0; i < count - 1; i++) {
+                        editor.selection.moveCursorDown();
+                    }
+                    editor.blockOutdent();
+                    editor.selection.clearSelection();
+                    editor.moveCursorToPosition(pos);
+                    editor.navigateLineEnd();
+                    editor.navigateLineStart();
+                    break;
+            }
+        }
+    }
+};
+});
--- a/lib/ace/keyboard/vim/maps/util.js
+++ b/lib/ace/keyboard/vim/maps/util.js
@ -0,0 +1,132 @@
+define(function(require, exports, module) {
+var registers = require("../registers");
+
+var dom = require("../../../lib/dom");
+dom.importCssString('.insert-mode .ace_cursor{\
+    border-left: 2px solid #333333;\
+}\
+.ace_dark.insert-mode .ace_cursor{\
+    border-left: 2px solid #eeeeee;\
+}\
+.normal-mode .ace_cursor{\
+    border: 0!important;\
+    background-color: red;\
+    opacity: 0.5;\
+}', 'vimMode');
+
+module.exports = {
+    onVisualMode: false,
+    onVisualLineMode: false,
+    currentMode: 'normal',
+    noMode: function(editor) {
+        editor.unsetStyle('insert-mode');
+        editor.unsetStyle('normal-mode');
+        if (editor.commands.recording)
+            editor.commands.toggleRecording(editor);
+        editor.setOverwrite(false);
+    },
+    insertMode: function(editor) {
+        this.currentMode = 'insert';
+        // Switch editor to insert mode
+        editor.setStyle('insert-mode');
+        editor.unsetStyle('normal-mode');
+
+        editor.setOverwrite(false);
+        editor.keyBinding.$data.buffer = "";
+        editor.keyBinding.$data.vimState = "insertMode";
+        this.onVisualMode = false;
+        this.onVisualLineMode = false;
+        if(this.onInsertReplaySequence) {
+            // Ok, we're apparently replaying ("."), so let's do it
+            editor.commands.macro = this.onInsertReplaySequence;
+            editor.commands.replay(editor);
+            this.onInsertReplaySequence = null;
+            this.normalMode(editor);
+        } else {
+            editor._emit("changeStatus");
+            // Record any movements, insertions in insert mode
+            if(!editor.commands.recording)
+                editor.commands.toggleRecording(editor);
+        }
+    },
+    normalMode: function(editor) {
+        // Switch editor to normal mode
+        this.currentMode = 'normal';
+
+        editor.unsetStyle('insert-mode');
+        editor.setStyle('normal-mode');
+        editor.clearSelection();
+
+        var pos;
+        if (!editor.getOverwrite()) {
+            pos = editor.getCursorPosition();
+            if (pos.column > 0)
+                editor.navigateLeft();
+        }
+
+        editor.setOverwrite(true);
+        editor.keyBinding.$data.buffer = "";
+        editor.keyBinding.$data.vimState = "start";
+        this.onVisualMode = false;
+        this.onVisualLineMode = false;
+        editor._emit("changeStatus");
+        // Save recorded keystrokes
+        if (editor.commands.recording) {
+            editor.commands.toggleRecording(editor);
+            return editor.commands.macro;
+        }
+        else {
+            return [];
+        }
+    },
+    visualMode: function(editor, lineMode) {
+        if (
+            (this.onVisualLineMode && lineMode)
+            || (this.onVisualMode && !lineMode)
+        ) {
+            this.normalMode(editor);
+            return;
+        }
+
+        editor.setStyle('insert-mode');
+        editor.unsetStyle('normal-mode');
+
+        editor._emit("changeStatus");
+        if (lineMode) {
+            this.onVisualLineMode = true;
+        } else {
+            this.onVisualMode = true;
+            this.onVisualLineMode = false;
+        }
+    },
+    getRightNthChar: function(editor, cursor, ch, n) {
+        var line = editor.getSession().getLine(cursor.row);
+        var matches = line.substr(cursor.column + 1).split(ch);
+
+        return n < matches.length ? matches.slice(0, n).join(ch).length : null;
+    },
+    getLeftNthChar: function(editor, cursor, ch, n) {
+        var line = editor.getSession().getLine(cursor.row);
+        var matches = line.substr(0, cursor.column).split(ch);
+
+        return n < matches.length ? matches.slice(-1 * n).join(ch).length : null;
+    },
+    toRealChar: function(ch) {
+        if (ch.length === 1)
+            return ch;
+
+        if (/^shift-./.test(ch))
+            return ch[ch.length - 1].toUpperCase();
+        else
+            return "";
+    },
+    copyLine: function(editor) {
+        var pos = editor.getCursorPosition();
+        editor.selection.moveTo(pos.row, pos.column);
+        editor.selection.selectLine();
+        registers._default.isLine = true;
+        registers._default.text = editor.getCopyText().replace(/\n$/, "");
+        editor.selection.moveTo(pos.row, pos.column);
+    }
+};
+});
--- a/lib/ace/keyboard/vim/registers.js
+++ b/lib/ace/keyboard/vim/registers.js
@ -30,10 +30,13 @@

 define(function(require, exports, module) {

-exports.isDark = false;
-exports.cssClass = "ace-sqlserver";
-exports.cssText = require("../requirejs/text!./sqlserver.css");
+"never use strict";
+
+module.exports = {
+    _default: {
+        text: "",
+        isLine: false
+    }
+};

-var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
 });
--- a/lib/ace/keyboard/vim_test.js
+++ b/lib/ace/keyboard/vim_test.js
--- a/lib/ace/layer/cursor.js
+++ b/lib/ace/layer/cursor.js
@ -195,15 +195,11 @@ var Cursor = function(parentEl) {
            }

            var style = (this.cursors[cursorIndex++] || this.addCursor()).style;
-            
-            if (!this.drawCursor) {
-                style.left = pixelPos.left + "px";
-                style.top = pixelPos.top + "px";
-                style.width = config.characterWidth + "px";
-                style.height = config.lineHeight + "px";
-            } else {
-                this.drawCursor(style, pixelPos, config, selections[i], this.session);
-            }
+
+            style.left = pixelPos.left + "px";
+            style.top = pixelPos.top + "px";
+            style.width = config.characterWidth + "px";
+            style.height = config.lineHeight + "px";
        }
        while (this.cursors.length > cursorIndex)
            this.removeCursor();
@ -215,8 +211,6 @@ var Cursor = function(parentEl) {
        this.$pixelPos = pixelPos;
        this.restartTimer();
    };
-    
-    this.drawCursor = null;

    this.$setOverwrite = function(overwrite) {
        if (overwrite != this.overwrite) {
--- a/lib/ace/layer/font_metrics.js
+++ b/lib/ace/layer/font_metrics.js
@ -82,9 +82,9 @@ var FontMetrics = exports.FontMetrics = function(parentEl, interval) {
    
    this.$setMeasureNodeStyles = function(style, isRoot) {
        style.width = style.height = "auto";
-        style.left = style.top = "0px";
+        style.left = style.top = "-100px";
        style.visibility = "hidden";
-        style.position = "absolute";
+        style.position = "fixed";
        style.whiteSpace = "pre";

        if (useragent.isIE < 8) {
@ -120,9 +120,9 @@ var FontMetrics = exports.FontMetrics = function(parentEl, interval) {
    this.setPolling = function(val) {
        if (val) {
            this.$pollSizeChanges();
-        } else if (this.$pollSizeChangesTimer) {
-            clearInterval(this.$pollSizeChangesTimer);
-            this.$pollSizeChangesTimer = 0;
+        } else {
+            if (this.$pollSizeChangesTimer)
+                this.$pollSizeChangesTimer;
        }
    };

--- a/lib/ace/layer/gutter.js
+++ b/lib/ace/layer/gutter.js
@ -100,14 +100,16 @@ var Gutter = function(parentEl) {
        }
    };

-    this.$updateAnnotations = function (delta) {
+    this.$updateAnnotations = function (e) {
        if (!this.$annotations.length)
            return;
-        var firstRow = delta.start.row;
-        var len = delta.end.row - firstRow;
+        var delta = e.data;
+        var range = delta.range;
+        var firstRow = range.start.row;
+        var len = range.end.row - firstRow;
        if (len === 0) {
            // do nothing
-        } else if (delta.action == 'remove') {
+        } else if (delta.action == "removeText" || delta.action == "removeLines") {
            this.$annotations.splice(firstRow, len + 1, null);
        } else {
            var args = new Array(len + 1);
--- a/lib/ace/layer/marker.js
+++ b/lib/ace/layer/marker.js
@ -90,7 +90,7 @@ var Marker = function(parentEl) {
                else
                    this.drawMultiLineMarker(html, range, marker.clazz, config);
            } else {
-                this.drawSingleLineMarker(html, range, marker.clazz + " ace_start" + " ace_br15", config);
+                this.drawSingleLineMarker(html, range, marker.clazz + " ace_start", config);
            }
        }
        this.element.innerHTML = html.join("");
@ -100,30 +100,27 @@ var Marker = function(parentEl) {
        return (row - layerConfig.firstRowScreen) * layerConfig.lineHeight;
    };

-    function getBorderClass(tl, tr, br, bl) {
-        return (tl ? 1 : 0) | (tr ? 2 : 0) | (br ? 4 : 0) | (bl ? 8 : 0);
-    }
    // Draws a marker, which spans a range of text on multiple lines 
    this.drawTextMarker = function(stringBuilder, range, clazz, layerConfig, extraStyle) {
-        var session = this.session;
-        var start = range.start.row;
-        var end = range.end.row;
-        var row = start;
-        var prev = 0; 
-        var curr = 0;
-        var next = session.getScreenLastRowColumn(row);
-        var lineRange = new Range(row, range.start.column, row, curr);
-        for (; row <= end; row++) {
-            lineRange.start.row = lineRange.end.row = row;
-            lineRange.start.column = row == start ? range.start.column : session.getRowWrapIndent(row);
-            lineRange.end.column = next;
-            prev = curr;
-            curr = next;
-            next = row + 1 < end ? session.getScreenLastRowColumn(row + 1) : row == end ? 0 : range.end.column;
-            this.drawSingleLineMarker(stringBuilder, lineRange, 
-                clazz + (row == start  ? " ace_start" : "") + " ace_br"
-                    + getBorderClass(row == start || row == start + 1 && range.start.column, prev < curr, curr > next, row == end),
-                layerConfig, row == end ? 0 : 1, extraStyle);
+        // selection start
+        var row = range.start.row;
+
+        var lineRange = new Range(
+            row, range.start.column,
+            row, this.session.getScreenLastRowColumn(row)
+        );
+        this.drawSingleLineMarker(stringBuilder, lineRange, clazz + " ace_start", layerConfig, 1, extraStyle);
+
+        // selection end
+        row = range.end.row;
+        lineRange = new Range(row, 0, row, range.end.column);
+        this.drawSingleLineMarker(stringBuilder, lineRange, clazz, layerConfig, 0, extraStyle);
+
+        for (row = range.start.row + 1; row < range.end.row; row++) {
+            lineRange.start.row = row;
+            lineRange.end.row = row;
+            lineRange.end.column = this.session.getScreenLastRowColumn(row);
+            this.drawSingleLineMarker(stringBuilder, lineRange, clazz, layerConfig, 1, extraStyle);
        }
    };

@ -137,7 +134,7 @@ var Marker = function(parentEl) {
        extraStyle = extraStyle || "";

        stringBuilder.push(
-            "<div class='", clazz, " ace_br1 ace_start' style='",
+            "<div class='", clazz, " ace_start' style='",
            "height:", height, "px;",
            "right:0;",
            "top:", top, "px;",
@ -149,7 +146,7 @@ var Marker = function(parentEl) {
        var width = range.end.column * config.characterWidth;

        stringBuilder.push(
-            "<div class='", clazz, " ace_br12' style='",
+            "<div class='", clazz, "' style='",
            "height:", height, "px;",
            "width:", width, "px;",
            "top:", top, "px;",
@ -158,14 +155,12 @@ var Marker = function(parentEl) {

        // all the complete lines
        height = (range.end.row - range.start.row - 1) * config.lineHeight;
-        if (height <= 0)
+        if (height < 0)
            return;
        top = this.$getTop(range.start.row + 1, config);
-        
-        var radiusClass = (range.start.column ? 1 : 0) | (range.end.column ? 0 : 8);

        stringBuilder.push(
-            "<div class='", clazz, (radiusClass ? " ace_br" + radiusClass : ""), "' style='",
+            "<div class='", clazz, "' style='",
            "height:", height, "px;",
            "right:0;",
            "top:", top, "px;",
--- a/lib/ace/layer/text.js
+++ b/lib/ace/layer/text.js
@ -52,7 +52,7 @@ var Text = function(parentEl) {
    this.EOL_CHAR_LF = "\xAC";
    this.EOL_CHAR_CRLF = "\xa4";
    this.EOL_CHAR = this.EOL_CHAR_LF;
-    this.TAB_CHAR = "\u2014"; //"\u21E5";
+    this.TAB_CHAR = "\u2192"; //"\u21E5";
    this.SPACE_CHAR = "\xB7";
    this.$padding = 0;

@ -128,10 +128,11 @@ var Text = function(parentEl) {
        for (var i = 1; i < tabSize + 1; i++) {
            if (this.showInvisibles) {
                tabStr.push("<span class='ace_invisible ace_invisible_tab'>"
-                    + lang.stringRepeat(this.TAB_CHAR, i)
+                    + this.TAB_CHAR
+                    + lang.stringRepeat("\xa0", i - 1)
                    + "</span>");
            } else {
-                tabStr.push(lang.stringRepeat(" ", i));
+                tabStr.push(lang.stringRepeat("\xa0", i));
            }
        }
        if (this.displayIndentGuides) {
@ -144,9 +145,9 @@ var Text = function(parentEl) {
                spaceClass = " ace_invisible_space";
                tabClass = " ace_invisible_tab";
                var spaceContent = lang.stringRepeat(this.SPACE_CHAR, this.tabSize);
-                var tabContent = lang.stringRepeat(this.TAB_CHAR, this.tabSize);
+                var tabContent = this.TAB_CHAR + lang.stringRepeat("\xa0", this.tabSize - 1);
            } else{
-                var spaceContent = lang.stringRepeat(" ", this.tabSize);
+                var spaceContent = lang.stringRepeat("\xa0", this.tabSize);
                var tabContent = spaceContent;
            }

@ -324,9 +325,9 @@ var Text = function(parentEl) {
        var replaceReg = /\t|&|<|( +)|([\x00-\x1f\x80-\xa0\xad\u1680\u180E\u2000-\u200f\u2028\u2029\u202F\u205F\u3000\uFEFF])|[\u1100-\u115F\u11A3-\u11A7\u11FA-\u11FF\u2329-\u232A\u2E80-\u2E99\u2E9B-\u2EF3\u2F00-\u2FD5\u2FF0-\u2FFB\u3000-\u303E\u3041-\u3096\u3099-\u30FF\u3105-\u312D\u3131-\u318E\u3190-\u31BA\u31C0-\u31E3\u31F0-\u321E\u3220-\u3247\u3250-\u32FE\u3300-\u4DBF\u4E00-\uA48C\uA490-\uA4C6\uA960-\uA97C\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFAFF\uFE10-\uFE19\uFE30-\uFE52\uFE54-\uFE66\uFE68-\uFE6B\uFF01-\uFF60\uFFE0-\uFFE6]/g;
        var replaceFunc = function(c, a, b, tabIdx, idx4) {
            if (a) {
-                return self.showInvisibles
-                    ? "<span class='ace_invisible ace_invisible_space'>" + lang.stringRepeat(self.SPACE_CHAR, c.length) + "</span>"
-                    : c;
+                return self.showInvisibles ?
+                    "<span class='ace_invisible ace_invisible_space'>" + lang.stringRepeat(self.SPACE_CHAR, c.length) + "</span>" :
+                    lang.stringRepeat("\xa0", c.length);
            } else if (c == "&") {
                return "&#38;";
            } else if (c == "<") {
@ -419,8 +420,6 @@ var Text = function(parentEl) {
                        );
                    }

-                    stringBuilder.push(lang.stringRepeat("\xa0", splits.indent));
-
                    split ++;
                    screenColumn = 0;
                    splitChars = splits[split] || Number.MAX_VALUE;
--- a/lib/ace/layer/text_test.js
+++ b/lib/ace/layer/text_test.js
@ -89,9 +89,9 @@ module.exports = {
    "test rendering of indent guides" : function() {
        var textLayer = this.textLayer
        var EOL = "<span class='ace_invisible ace_invisible_eol'>" + textLayer.EOL_CHAR + "</span>";
-        var SPACE = function(i) {return Array(i+1).join(" ")}
+        var SPACE = function(i) {return Array(i+1).join("\xa0")}
        var DOT = function(i) {return Array(i+1).join(textLayer.SPACE_CHAR)}
-        var TAB = function(i) {return Array(i+1).join(textLayer.TAB_CHAR)}
+        var TAB = function(i) {return textLayer.TAB_CHAR + SPACE(i-1)}
        function testRender(results) {
            for (var i = results.length; i--; ) {
                var stringBuilder = [];
--- a/lib/ace/lib/app_config.js
+++ b/lib/ace/lib/app_config.js
@ -1,157 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Distributed under the BSD license:
- *
- * Copyright (c) 2010, Ajax.org B.V.
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Ajax.org B.V. nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define(function(require, exports, module) {
-"no use strict";
-
-var oop = require("./oop");
-var EventEmitter = require("./event_emitter").EventEmitter;
-
-var optionsProvider = {
-    setOptions: function(optList) {
-        Object.keys(optList).forEach(function(key) {
-            this.setOption(key, optList[key]);
-        }, this);
-    },
-    getOptions: function(optionNames) {
-        var result = {};
-        if (!optionNames) {
-            optionNames = Object.keys(this.$options);
-        } else if (!Array.isArray(optionNames)) {
-            result = optionNames;
-            optionNames = Object.keys(result);
-        }
-        optionNames.forEach(function(key) {
-            result[key] = this.getOption(key);
-        }, this);
-        return result;
-    },
-    setOption: function(name, value) {
-        if (this["$" + name] === value)
-            return;
-        var opt = this.$options[name];
-        if (!opt) {
-            return warn('misspelled option "' + name + '"');
-        }
-        if (opt.forwardTo)
-            return this[opt.forwardTo] && this[opt.forwardTo].setOption(name, value);
-
-        if (!opt.handlesSet)
-            this["$" + name] = value;
-        if (opt && opt.set)
-            opt.set.call(this, value);
-    },
-    getOption: function(name) {
-        var opt = this.$options[name];
-        if (!opt) {
-            return warn('misspelled option "' + name + '"');
-        }
-        if (opt.forwardTo)
-            return this[opt.forwardTo] && this[opt.forwardTo].getOption(name);
-        return opt && opt.get ? opt.get.call(this) : this["$" + name];
-    }
-};
-
-function warn(message) {
-    if (typeof console != "undefined" && console.warn)
-        console.warn.apply(console, arguments);
-}
-
-function reportError(msg, data) {
-    var e = new Error(msg);
-    e.data = data;
-    if (typeof console == "object" && console.error)
-        console.error(e);
-    setTimeout(function() { throw e; });
-}
-
-var AppConfig = function() {
-    this.$defaultOptions = {};
-};
-
-(function() {
-    // module loading
-    oop.implement(this, EventEmitter);
-    /*
-     * option {name, value, initialValue, setterName, set, get }
-     */
-    this.defineOptions = function(obj, path, options) {
-        if (!obj.$options)
-            this.$defaultOptions[path] = obj.$options = {};
-
-        Object.keys(options).forEach(function(key) {
-            var opt = options[key];
-            if (typeof opt == "string")
-                opt = {forwardTo: opt};
-
-            opt.name || (opt.name = key);
-            obj.$options[opt.name] = opt;
-            if ("initialValue" in opt)
-                obj["$" + opt.name] = opt.initialValue;
-        });
-
-        // implement option provider interface
-        oop.implement(obj, optionsProvider);
-
-        return this;
-    };
-
-    this.resetOptions = function(obj) {
-        Object.keys(obj.$options).forEach(function(key) {
-            var opt = obj.$options[key];
-            if ("value" in opt)
-                obj.setOption(key, opt.value);
-        });
-    };
-
-    this.setDefaultValue = function(path, name, value) {
-        var opts = this.$defaultOptions[path] || (this.$defaultOptions[path] = {});
-        if (opts[name]) {
-            if (opts.forwardTo)
-                this.setDefaultValue(opts.forwardTo, name, value);
-            else
-                opts[name].value = value;
-        }
-    };
-
-    this.setDefaultValues = function(path, optionHash) {
-        Object.keys(optionHash).forEach(function(key) {
-            this.setDefaultValue(path, key, optionHash[key]);
-        }, this);
-    };
-    
-    this.warn = warn;
-    this.reportError = reportError;
-    
-}).call(AppConfig.prototype);
-
-exports.AppConfig = AppConfig;
-
-});
--- a/lib/ace/lib/dom.js
+++ b/lib/ace/lib/dom.js
@ -31,6 +31,9 @@
 define(function(require, exports, module) {
 "use strict";

+if (typeof document == "undefined")
+    return;
+
 var XHTML_NS = "http://www.w3.org/1999/xhtml";

 exports.getDocumentHead = function(doc) {
@ -91,11 +94,6 @@ exports.toggleCssClass = function(el, name) {
    return add;
 };

-if (typeof document == "undefined") {
-    exports.importCssString = function() {};
-    return;
-}
-
 /*
 * Add or remove a CSS class from the list of classes on the given node
 * depending on the value of <tt>include</tt>
@ -177,7 +175,6 @@ exports.getInnerHeight = function(element) {
    );
 };

-
 if (window.pageYOffset !== undefined) {
    exports.getPageScrollTop = function() {
        return window.pageYOffset;
--- a/lib/ace/lib/event.js
+++ b/lib/ace/lib/event.js
@ -241,17 +241,32 @@ function normalizeCommandKeys(callback, e, keyCode) {
        if (keyCode === 18 || keyCode === 17) {
            var location = "location" in e ? e.location : e.keyLocation;
            if (keyCode === 17 && location === 1) {
-                if (pressedKeys[keyCode] == 1)
-                    ts = e.timeStamp;
+                ts = e.timeStamp;
            } else if (keyCode === 18 && hashId === 3 && location === 2) {
-                var dt = e.timeStamp - ts;
-                if (dt < 50)
+                var dt = -ts;
+                ts = e.timeStamp;
+                dt += ts;
+                if (dt < 3)
                    pressedKeys.altGr = true;
            }
        }
    }
    
    if (keyCode in keys.MODIFIER_KEYS) {
+        switch (keys.MODIFIER_KEYS[keyCode]) {
+            case "Alt":
+                hashId = 2;
+                break;
+            case "Shift":
+                hashId = 4;
+                break;
+            case "Ctrl":
+                hashId = 1;
+                break;
+            default:
+                hashId = 8;
+                break;
+        }
        keyCode = -1;
    }

@ -308,7 +323,7 @@ exports.addCommandKeyListener = function(el, callback) {
        var lastDefaultPrevented = null;

        addListener(el, "keydown", function(e) {
-            pressedKeys[e.keyCode] = (pressedKeys[e.keyCode] || 0) + 1;
+            pressedKeys[e.keyCode] = true;
            var result = normalizeCommandKeys(callback, e, e.keyCode);
            lastDefaultPrevented = e.defaultPrevented;
            return result;
@ -326,14 +341,13 @@ exports.addCommandKeyListener = function(el, callback) {
        });

        if (!pressedKeys) {
-            resetPressedKeys();
-            addListener(window, "focus", resetPressedKeys);
+            pressedKeys = Object.create(null);
+            addListener(window, "focus", function(e) {
+                pressedKeys = Object.create(null);
+            });
        }
    }
 };
-function resetPressedKeys(e) {
-    pressedKeys = Object.create(null);
-}

 if (window.postMessage && !useragent.isOldIE) {
    var postMessageId = 1;
--- a/lib/ace/lib/keys.js
+++ b/lib/ace/lib/keys.js
@ -104,8 +104,8 @@ var Keys = (function() {
           73: 'i',  74: 'j',  75: 'k',  76: 'l',  77: 'm',  78: 'n', 79:  'o',
           80: 'p',  81: 'q',  82: 'r',  83: 's',  84: 't',  85: 'u', 86:  'v',
           87: 'w',  88: 'x',  89: 'y',  90: 'z', 107: '+', 109: '-', 110: '.',
-          186: ';', 187: '=', 188: ',', 189: '-', 190: '.', 191: '/', 192: '`',
-          219: '[', 220: '\\',221: ']', 222: '\''
+          187: '=', 188: ',', 189: '-', 190: '.', 191: '/', 192: '`', 219: '[',
+          220: '\\',221: ']', 222: '\''
        }
    };

@ -146,7 +146,7 @@ var Keys = (function() {
    })();

    ret.KEY_MODS[0] = "";
-    ret.KEY_MODS[-1] = "input-";
+    ret.KEY_MODS[-1] = "input";

    return ret;
 })();
--- a/lib/ace/lib/lang.js
+++ b/lib/ace/lib/lang.js
@ -81,24 +81,20 @@ exports.copyArray = function(array){
    return copy;
 };

-exports.deepCopy = function deepCopy(obj) {
+exports.deepCopy = function (obj) {
    if (typeof obj !== "object" || !obj)
        return obj;
-    var copy;
-    if (Array.isArray(obj)) {
-        copy = [];
-        for (var key = 0; key < obj.length; key++) {
-            copy[key] = deepCopy(obj[key]);
-        }
-        return copy;
-    }
    var cons = obj.constructor;
    if (cons === RegExp)
        return obj;
    
-    copy = cons();
+    var copy = cons();
    for (var key in obj) {
-        copy[key] = deepCopy(obj[key]);
+        if (typeof obj[key] === "object") {
+            copy[key] = exports.deepCopy(obj[key]);
+        } else {
+            copy[key] = obj[key];
+        }
    }
    return copy;
 };
--- a/lib/ace/line_widgets.js
+++ b/lib/ace/line_widgets.js
@ -113,16 +113,18 @@ function LineWidgets(session) {
        });
    };

-    this.updateOnChange = function(delta) {
+    this.updateOnChange = function(e) {
        var lineWidgets = this.session.lineWidgets;
        if (!lineWidgets) return;
-        
-        var startRow = delta.start.row;
-        var len = delta.end.row - startRow;
+            
+        var delta = e.data;
+        var range = delta.range;
+        var startRow = range.start.row;
+        var len = range.end.row - startRow;

        if (len === 0) {
            // return
-        } else if (delta.action == 'remove') {
+        } else if (delta.action == "removeText" || delta.action == "removeLines") {
            var removed = lineWidgets.splice(startRow + 1, len);
            removed.forEach(function(w) {
                w && this.removeLineWidget(w);
--- a/lib/ace/mode/_test/text_ruby.txt
+++ b/lib/ace/mode/_test/text_ruby.txt
@ -13,7 +13,7 @@
    [1, +1, -1, 12_345, 0.000_1,
    _, 3_1, 1_2, 1_.0, 0._1];
 
-{:id => ?", :key => "value", anotherKey: [x, y?]}
+{:id => 34, :key => "value"}

 =begin
 =end
--- a/lib/ace/mode/_test/tokens_abc.json
+++ b/lib/ace/mode/_test/tokens_abc.json
--- a/lib/ace/mode/_test/tokens_c_cpp.json
+++ b/lib/ace/mode/_test/tokens_c_cpp.json
@ -137,12 +137,7 @@
   "start",
  ["text","    "],
  ["keyword","#if"],
-  ["text"," "],
-  ["identifier","VERBOSE"],
-  ["text"," "],
-  ["keyword.operator",">="],
-  ["text"," "],
-  ["constant.numeric","2"]
+  ["constant.other"," VERBOSE >= 2"]
 ],[
   "start",
  ["text","        "],
--- a/lib/ace/mode/_test/tokens_gherkin.json
+++ b/lib/ace/mode/_test/tokens_gherkin.json
@ -56,34 +56,34 @@
 ],[
   "start",
  ["text","      "],
-  ["comment","|"],
-  ["string"," start "],
-  ["comment","|"],
-  ["string"," eat "],
-  ["comment","|"],
-  ["string"," left "],
+  ["comment","| "],
+  ["string","start "],
+  ["comment","| "],
+  ["string","eat "],
+  ["comment","| "],
+  ["string","left "],
  ["comment","|"]
 ],[
   "start",
  ["text","      "],
-  ["comment","|"],
-  ["string","  12   "],
-  ["comment","|"],
-  ["string","  5  "],
-  ["comment","|"],
-  ["string","  7   "],
+  ["comment","| "],
+  ["string"," 12   "],
+  ["comment","| "],
+  ["string"," 5  "],
+  ["comment","| "],
+  ["string"," 7   "],
  ["comment","|"]
 ],[
   "start",
  ["text","      "],
-  ["comment","|"],
-  ["string","  20   "],
-  ["comment","|"],
-  ["string","  5  "],
-  ["comment","|"],
-  ["string","  15  "],
-  ["comment","|"],
-  ["string","    "]
+  ["comment","| "],
+  ["string"," 20   "],
+  ["comment","| "],
+  ["string"," 5  "],
+  ["comment","| "],
+  ["string"," 15  "],
+  ["comment","| "],
+  ["string","   "]
 ],[
   "start"
 ],[
--- a/lib/ace/mode/_test/tokens_mask.json
+++ b/lib/ace/mode/_test/tokens_mask.json
@ -1,302 +0,0 @@
-[[
-   "start",
-  ["comment","/* Mask Syntax Demo */"]
-],[
-   "start"
-],[
-   "start",
-  ["keyword.support.constant.language","div"],
-  ["text"," "],
-  ["paren.lparen",">"],
-  ["text"," "],
-  ["string.start","'"],
-  ["string"," Test "],
-  ["paren.lparen.markup.italic","~["],
-  ["identifier","name"],
-  ["paren.rparen.markup.italic","]"],
-  ["string.end","'"],
-  ["paren.rparen",";"]
-],[
-   "start"
-],[
-   "start",
-  ["keyword","define"],
-  ["text"," :"],
-  ["support.variable.class","userProfile"],
-  ["text"," "],
-  ["paren.lparen","{"]
-],[
-   "start",
-  ["text","\t"],
-  ["keyword.support.constant.language","header"],
-  ["text"," "],
-  ["paren.lparen","{"]
-],[
-   "start",
-  ["text","\t\t"],
-  ["keyword.support.constant.language","h4"],
-  ["text"," "],
-  ["paren.lparen",">"],
-  ["text"," "],
-  ["support.function.markup.bold","@title"],
-  ["paren.lparen",";"]
-],[
-   "start",
-  ["text","\t\t"],
-  ["keyword.support.constant.language","button"],
-  ["support.variable.class",".close"],
-  ["paren.lparen",";"]
-],[
-   "start",
-  ["text","\t"],
-  ["paren.rparen","}"]
-],[
-   "start",
-  ["paren.rparen","}"]
-],[
-   "start"
-],[
-   "start",
-  ["support.function.markup.bold",":userProfile"],
-  ["text"," "],
-  ["paren.lparen","{"]
-],[
-   "start",
-  ["text","\t"],
-  ["support.function.markup.bold","@title"],
-  ["text"," "],
-  ["paren.lparen",">"],
-  ["text"," "],
-  ["string.start","'"],
-  ["string"," Hello "],
-  ["paren.lparen.markup.italic","~["],
-  ["keyword.control.markup.italic",":"],
-  ["text"," "],
-  ["identifier","username"],
-  ["punctuation.operator","."],
-  ["support.function","toUpperCase"],
-  ["paren.lparen","("],
-  ["paren.rparen",")"],
-  ["paren.rparen.markup.italic","]"],
-  ["string.end","'"]
-],[
-   "start",
-  ["paren.rparen","}"]
-],[
-   "start"
-],[
-   ["paren.lparen52","constant.language40"],
-  ["constant.language","style"],
-  ["text"," "],
-  ["paren.lparen","{"]
-],[
-   ["css-block-ruleset","paren.lparen52","paren.lparen52","constant.language40"],
-  ["text","    "],
-  ["constant","html"],
-  ["text",", "],
-  ["constant","body"],
-  ["text"," "],
-  ["paren.lparen","{"]
-],[
-   ["css-block-ruleset","paren.lparen52","paren.lparen52","constant.language40"],
-  ["text","        "],
-  ["support.type","background"],
-  ["text",": "],
-  ["support.function","url("],
-  ["string","'name.png'"],
-  ["support.function",")"],
-  ["text"," "],
-  ["constant.numeric","0"],
-  ["text"," "],
-  ["constant.numeric","0"],
-  ["text"," "],
-  ["support.constant","no-repeat"],
-  ["text",";"]
-],[
-   ["paren.lparen52","constant.language40"],
-  ["text","    "],
-  ["paren.rparen","}"]
-],[
-   ["#tmp","css-block-end","paren.lparen52","constant.language40"],
-  ["paren.rparen","}"]
-],[
-   ["#tmp","start","paren.lparen52","constant.language40"]
-],[
-   ["#tmp","start","paren.lparen52","constant.language40"],
-  ["keyword.support.constant.language","button"],
-  ["text"," "],
-  ["paren.lparen","{"]
-],[
-   ["paren.lparen39","constant.language27","constant.language27","start","paren.lparen52","constant.language40"],
-  ["text","\t"],
-  ["constant.language","event"],
-  ["text"," "],
-  ["support.variable.class","click"],
-  ["text"," "],
-  ["paren.lparen","("],
-  ["identifier","e"],
-  ["paren.rparen",")"],
-  ["text"," "],
-  ["paren.lparen","{"]
-],[
-   ["#tmp","js-block-start","paren.lparen39","constant.language27","constant.language27","start","paren.lparen52","constant.language40"],
-  ["text","\t    "],
-  ["variable.language","this"],
-  ["punctuation.operator","."],
-  ["identifier","textContent"],
-  ["text"," "],
-  ["keyword.operator","="],
-  ["text"," "],
-  ["string.quasi.start","`"],
-  ["string.quasi","name "],
-  ["paren.quasi.start","${"],
-  ["identifier","e"],
-  ["punctuation.operator","."],
-  ["identifier","clientX"],
-  ["paren.quasi.end","}"],
-  ["string.quasi"," !"],
-  ["string.quasi.end","`"],
-  ["punctuation.operator",";"]
-],[
-   ["#tmp","js-block-end","paren.lparen39","constant.language27","constant.language27","start","paren.lparen52","constant.language40"],
-  ["text","\t"],
-  ["paren.rparen","}"]
-],[
-   ["#tmp","start","paren.lparen39","constant.language27","constant.language27","start","paren.lparen52","constant.language40"],
-  ["paren.rparen","}"]
-],[
-   ["#tmp","start","paren.lparen39","constant.language27","constant.language27","start","paren.lparen52","constant.language40"]
-],[
-   ["paren.lparen13","constant.language","constant.language","start","paren.lparen39","constant.language27","constant.language27","start","paren.lparen52","constant.language40"],
-  ["constant.language","md"],
-  ["text"," "],
-  ["paren.lparen",">"],
-  ["text"," "],
-  ["paren.lparen","\"\"\""]
-],[
-   ["#tmp","md-multiline-allowBlock","paren.lparen13","constant.language","constant.language","start","paren.lparen39","constant.language27","constant.language27","start","paren.lparen52","constant.language40"]
-],[
-   ["#tmp","md-multiline-listblock","paren.lparen13","constant.language","constant.language","start","paren.lparen39","constant.language27","constant.language27","start","paren.lparen52","constant.language40"],
-  ["markup.list","- "],
-  ["list","div"]
-],[
-   ["#tmp","md-multiline-listblock","paren.lparen13","constant.language","constant.language","start","paren.lparen39","constant.language27","constant.language27","start","paren.lparen52","constant.language40"],
-  ["markup.list","- "],
-  ["list","span"]
-],[
-   ["#tmp","md-multiline-listblock","paren.lparen13","constant.language","constant.language","start","paren.lparen39","constant.language27","constant.language27","start","paren.lparen52","constant.language40"],
-  ["list"," "]
-],[
-   ["#tmp","md-multiline-listblock","paren.lparen13","constant.language","constant.language","start","paren.lparen39","constant.language27","constant.language27","start","paren.lparen52","constant.language40"],
-  ["list","Hello"]
-],[
-   ["#tmp","md-multiline-start","paren.lparen13","constant.language","constant.language","start","paren.lparen39","constant.language27","constant.language27","start","paren.lparen52","constant.language40"]
-],[
-   ["#tmp","md-multiline-start","paren.lparen13","constant.language","constant.language","start","paren.lparen39","constant.language27","constant.language27","start","paren.lparen52","constant.language40"],
-  ["text","["],
-  ["string","one"],
-  ["text","]("],
-  ["markup.underline","http://google.com"],
-  ["text",")"]
-],[
-   ["#tmp","md-multiline-allowBlock","paren.lparen13","constant.language","constant.language","start","paren.lparen39","constant.language27","constant.language27","start","paren.lparen52","constant.language40"]
-],[
-   ["#tmp","start","paren.lparen13","constant.language","constant.language","start","paren.lparen39","constant.language27","constant.language27","start","paren.lparen52","constant.language40"],
-  ["paren.rparen","\"\"\";"]
-],[
-   ["#tmp","start","paren.lparen13","constant.language","constant.language","start","paren.lparen39","constant.language27","constant.language27","start","paren.lparen52","constant.language40"]
-],[
-   ["#tmp","start","paren.lparen13","constant.language","constant.language","start","paren.lparen39","constant.language27","constant.language27","start","paren.lparen52","constant.language40"]
-],[
-   ["#tmp","start","paren.lparen13","constant.language","constant.language","start","paren.lparen39","constant.language27","constant.language27","start","paren.lparen52","constant.language40"],
-  ["keyword.support.constant.language","header"],
-  ["text"," "],
-  ["support.variable.class",".foo"],
-  ["text"," "],
-  ["paren.lparen",">"],
-  ["text"," "],
-  ["string.start","'"],
-  ["string","Heading"],
-  ["string.end","'"]
-],[
-   ["#tmp","start","paren.lparen13","constant.language","constant.language","start","paren.lparen39","constant.language27","constant.language27","start","paren.lparen52","constant.language40"]
-],[
-   ["string.start2","start","paren.lparen13","constant.language","constant.language","start","paren.lparen39","constant.language27","constant.language27","start","paren.lparen52","constant.language40"],
-  ["keyword.support.constant.language","button"],
-  ["text"," "],
-  ["support.variable.class",".baz"],
-  ["text"," "],
-  ["support.variable.class.markup.bold","x-signal"],
-  ["keyword.operator","="],
-  ["string.start","'"],
-  ["string","click: test"],
-  ["string.end","'"],
-  ["text"," "],
-  ["support.variable.class","disabled"],
-  ["text"," "],
-  ["paren.lparen",">"],
-  ["text"," "],
-  ["string.start","\""]
-],[
-   ["string.start2","start","paren.lparen13","constant.language","constant.language","start","paren.lparen39","constant.language27","constant.language27","start","paren.lparen52","constant.language40"],
-  ["string","\tHello,"]
-],[
-   ["string.start2","start","paren.lparen13","constant.language","constant.language","start","paren.lparen39","constant.language27","constant.language27","start","paren.lparen52","constant.language40"],
-  ["string","\tworld "]
-],[
-   ["string.start2","start","paren.lparen13","constant.language","constant.language","start","paren.lparen39","constant.language27","constant.language27","start","paren.lparen52","constant.language40"],
-  ["string","\t"],
-  ["string.escape","\\\""],
-  ["string","Buddy"],
-  ["string.escape","\\\""]
-],[
-   ["#tmp","start","paren.lparen13","constant.language","constant.language","start","paren.lparen39","constant.language27","constant.language27","start","paren.lparen52","constant.language40"],
-  ["string.end","\""]
-],[
-   ["#tmp","start","paren.lparen13","constant.language","constant.language","start","paren.lparen39","constant.language27","constant.language27","start","paren.lparen52","constant.language40"]
-],[
-   ["#tmp","js-statement-start","start","js-statement-no_regex","constant.language53","start","paren.lparen13","constant.language","constant.language","start","paren.lparen39","constant.language27","constant.language27","start","paren.lparen52","constant.language40"],
-  ["constant.language","var"],
-  ["text"," "],
-  ["identifier","a"],
-  ["text"," "],
-  ["keyword.operator","="],
-  ["text"," "],
-  ["paren","{"]
-],[
-   ["#tmp","js-statement-no_regex","start","js-statement-no_regex","constant.language53","start","paren.lparen13","constant.language","constant.language","start","paren.lparen39","constant.language27","constant.language27","start","paren.lparen52","constant.language40"],
-  ["text","    "],
-  ["identifier","name"],
-  ["punctuation.operator",":"],
-  ["text"," "],
-  ["string.quasi.start","`"],
-  ["string.quasi","name "],
-  ["paren.quasi.start","${"],
-  ["variable.language","window"],
-  ["punctuation.operator","."],
-  ["support.constant","innerWidth"],
-  ["paren.rparen","}"],
-  ["string.quasi.end","`"]
-],[
-   ["#tmp","start","paren.lparen13","constant.language","constant.language","start","paren.lparen39","constant.language27","constant.language27","start","paren.lparen52","constant.language40"],
-  ["paren.rparen","};"]
-],[
-   ["#tmp","start","paren.lparen13","constant.language","constant.language","start","paren.lparen39","constant.language27","constant.language27","start","paren.lparen52","constant.language40"]
-],[
-   ["#tmp","start","paren.lparen13","constant.language","constant.language","start","paren.lparen39","constant.language27","constant.language27","start","paren.lparen52","constant.language40"],
-  ["keyword.support.constant.language","span"],
-  ["text"," "],
-  ["support.variable.class",".foo"],
-  ["text"," "],
-  ["paren.lparen",">"],
-  ["text"," "],
-  ["string.start","\""],
-  ["paren.lparen.markup.italic","~["],
-  ["keyword.control.markup.italic","bind:"],
-  ["text"," "],
-  ["identifier","a"],
-  ["punctuation.operator","."],
-  ["identifier","name"],
-  ["paren.rparen.markup.italic","]"],
-  ["string.end","\""]
-]]
--- a/lib/ace/mode/_test/tokens_objectivec.json
+++ b/lib/ace/mode/_test/tokens_objectivec.json
@ -727,8 +727,7 @@
 ],[
   "start",
  ["keyword","#ifndef"],
-  ["text"," "],
-  ["constant.language.objc","Nil"]
+  ["constant.other"," Nil"]
 ],[
   "start",
  ["keyword","#define"],
--- a/lib/ace/mode/_test/tokens_ruby.json
+++ b/lib/ace/mode/_test/tokens_ruby.json
@ -139,7 +139,7 @@
  ["text"," "],
  ["punctuation.separator.key-value","=>"],
  ["text"," "],
-  ["string.character","?\""],
+  ["constant.numeric","34"],
  ["text",", "],
  ["constant.other.symbol.ruby",":key"],
  ["text"," "],
@ -148,15 +148,7 @@
  ["string.start","\""],
  ["string","value"],
  ["string.end","\""],
-  ["text",", "],
-  ["identifier","anotherKey"],
-  ["text",": "],
-  ["paren.lparen","["],
-  ["identifier","x"],
-  ["text",", "],
-  ["identifier","y"],
-  ["text","?"],
-  ["paren.rparen","]}"]
+  ["paren.rparen","}"]
 ],[
   "start"
 ],[
--- a/lib/ace/mode/_test/tokens_rust.json
+++ b/lib/ace/mode/_test/tokens_rust.json
@ -10,9 +10,10 @@
 ],[
   "start",
  ["keyword.source.rust","fn"],
-  ["text"," "],
+  ["meta.function.source.rust"," "],
  ["entity.name.function.source.rust","main"],
-  ["text","() {"]
+  ["meta.function.source.rust","("],
+  ["text",") {"]
 ],[
   "start",
  ["text","    "],
@ -87,14 +88,10 @@
 ],[
   "start",
  ["keyword.source.rust","fn"],
-  ["text"," "],
-  ["entity.name.function.source.rust","map"],
-  ["keyword.operator","<"],
-  ["text","T"],
-  ["keyword.operator",","],
-  ["text"," U"],
-  ["keyword.operator",">"],
-  ["text","(vector: &[T]"],
+  ["meta.function.source.rust"," "],
+  ["entity.name.function.source.rust","map<T, U>"],
+  ["meta.function.source.rust","("],
+  ["text","vector: &[T]"],
  ["keyword.operator",","],
  ["text"," function: &fn(v: &T) "],
  ["keyword.operator","->"],
--- a/lib/ace/mode/_test/tokens_vbscript.json
+++ b/lib/ace/mode/_test/tokens_vbscript.json
@ -199,5 +199,7 @@
  ["string.quoted.double.asp"," ... updated.\""]
 ],[
   "start",
-  ["storage.type.asp","End Sub"]
+  ["support.function.asp","End"],
+  ["text"," "],
+  ["storage.type.asp","Sub"]
 ]]
--- a/lib/ace/mode/abap_highlight_rules.js
+++ b/lib/ace/mode/abap_highlight_rules.js
@ -126,7 +126,7 @@ var AbapHighlightRules = function() {
            {token : "string", regex : "`",     next  : "start"},
            {defaultToken : "string"}
        ]
-    };
+    }
 };
 oop.inherits(AbapHighlightRules, TextHighlightRules);

--- a/lib/ace/mode/abc.js
+++ b/lib/ace/mode/abc.js
@ -1,58 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Distributed under the BSD license:
- *
- * Copyright (c) 2012, Ajax.org B.V.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Ajax.org B.V. nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- THIS FILE WAS AUTOGENERATED BY mode.tmpl.js
- */
-
-define(function (require, exports, module) {
-    "use strict";
-
-    var oop = require("../lib/oop");
-    var TextMode = require("./text").Mode;
-    var ABCHighlightRules = require("./abc_highlight_rules").ABCHighlightRules;
-// TODO: pick appropriate fold mode
-    var FoldMode = require("./folding/cstyle").FoldMode;
-
-    var Mode = function () {
-        this.HighlightRules = ABCHighlightRules;
-        this.foldingRules = new FoldMode();
-    };
-    oop.inherits(Mode, TextMode);
-
-    (function () {
-        // this.lineCommentStart = ""%.*"";
-        // this.blockComment = {start: ""/*"", end: ""*/""};
-        // Extra logic goes here.
-        this.$id = "ace/mode/abc"
-    }).call(Mode.prototype);
-
-    exports.Mode = Mode;
-});
--- a/lib/ace/mode/abc_highlight_rules.js
+++ b/lib/ace/mode/abc_highlight_rules.js
@ -1,114 +0,0 @@
-/* This file was partially autogenerated from https://github.com/jimhawkridge/SublimeABC
-
- Modifications
-
- -  more classes to express the abc semantic
- -  added syntax highlighting for Zupfnoter conventions (https://github.com/bwl21/zupfnoter)
- -  separate note pitch and note duration - even if it looks the same
-
- ***********************************************************************************************/
-
-
-define(function (require, exports, module) {
-    "use strict";
-
-    var oop = require("../lib/oop");
-    var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-    var ABCHighlightRules = function () {
-        // regexp must not have capturing parentheses. Use (?:) instead.
-        // regexps are ordered -> the first match is used
-
-        this.$rules = {
-            start: [
-                {
-                    token: ['zupfnoter.information.comment.line.percentage', 'information.keyword', 'in formation.keyword.embedded'],
-                    regex: '(%%%%)(hn\\.[a-z]*)(.*)',
-                    comment: 'Instruction Comment'
-                },
-                {
-                    token: ['information.comment.line.percentage', 'information.keyword.embedded'],
-                    regex: '(%%)(.*)',
-                    comment: 'Instruction Comment'
-                },
-
-                {
-                    token: 'comment.line.percentage',
-                    regex: '%.*',
-                    comment: 'Comments'
-                },
-
-                {
-                    token: 'barline.keyword.operator',
-                    regex: '[\\[:]*[|:][|\\]:]*(?:\\[?[0-9]+)?|\\[[0-9]+',
-                    comment: 'Bar lines'
-                },
-                {
-                    token: ['information.keyword.embedded', 'information.argument.string.unquoted'],
-                    regex: '(\\[[A-Za-z]:)([^\\]]*\\])',
-                    comment: 'embedded Header lines'
-                },
-                {
-                    token: ['information.keyword', 'information.argument.string.unquoted'],
-                    regex: '^([A-Za-z]:)([^%\\\\]*)',
-                    comment: 'Header lines'
-                },
-                {
-                    token: ['text', 'entity.name.function', 'string.unquoted', 'text'],
-                    regex: '(\\[)([A-Z]:)(.*?)(\\])',
-                    comment: 'Inline fields'
-                },
-                {
-                    token: ['accent.constant.language', 'pitch.constant.numeric', 'duration.constant.numeric'],
-                    regex: '([\\^=_]*)([A-Ga-gz][,\']*)([0-9]*/*[><0-9]*)',
-                    comment: 'Notes'
-                },
-                {
-                    token: 'zupfnoter.jumptarget.string.quoted',
-                    regex: '[\\"!]\\^\\:.*?[\\"!]',
-                    comment: 'Zupfnoter jumptarget'
-                }, {
-                    token: 'zupfnoter.goto.string.quoted',
-                    regex: '[\\"!]\\^\\@.*?[\\"!]',
-                    comment: 'Zupfnoter goto'
-                },
-                {
-                    token: 'zupfnoter.annotation.string.quoted',
-                    regex: '[\\"!]\\^\\!.*?[\\"!]',
-                    comment: 'Zupfnoter annoation'
-                },
-                {
-                    token: 'zupfnoter.annotationref.string.quoted',
-                    regex: '[\\"!]\\^\\#.*?[\\"!]',
-                    comment: 'Zupfnoter annotation reference'
-                },
-                {
-                    token: 'chordname.string.quoted',
-                    regex: '[\\"!]\\^.*?[\\"!]',
-                    comment: 'abc chord'
-                },
-                {
-                    token: 'string.quoted',
-                    regex: '[\\"!].*?[\\"!]',
-                    comment: 'abc annotation'
-                }
-
-            ]
-        };
-
-        //  this.embedRules(JsonHighlightRules, "json-")
-
-        this.normalizeRules();
-    };
-
-    ABCHighlightRules.metaData = {
-        fileTypes: ['abc'],
-        name: 'ABC',
-        scopeName: 'text.abcnotation'
-    };
-
-
-    oop.inherits(ABCHighlightRules, TextHighlightRules);
-
-    exports.ABCHighlightRules = ABCHighlightRules;
-});
--- a/lib/ace/mode/behaviour/behaviour_test.js
+++ b/lib/ace/mode/behaviour/behaviour_test.js
@ -30,7 +30,6 @@

 if (typeof process !== "undefined") {
    require("amd-loader");
-    require("../../test/mockdom");
 }

 define(function(require, exports, module) {
@ -43,7 +42,6 @@ var Editor = require("../../editor").Editor;
 var EditSession = require("../../edit_session").EditSession;
 var MockRenderer = require("../../test/mockrenderer").MockRenderer;
 var JavaScriptMode = require("../javascript").Mode;
-var XMLMode = require("../xml").Mode;
 var editor;
 var exec = function(name, times, args) {
    do {
@ -55,6 +53,9 @@ var testRanges = function(str) {
 };

 module.exports = {
+
+    name: "ACE multi_select.js",
+
    "test: cstyle": function() {
        function testValue(line) {
            assert.equal(editor.getValue(), Array(4).join(line + "\n"));
@ -119,56 +120,9 @@ module.exports = {
        
        editor.setValue("");
        exec("insertstring", 1, "{");
-        assert.equal(editor.getValue(), "{");
+        assert.equal(editor.getValue(), "{")
        exec("insertstring", 1, "\n");
-        assert.equal(editor.getValue(), "{\n    \n}");
-        
-        editor.setValue("");
-        exec("insertstring", 1, "(");
-        exec("insertstring", 1, '"');
-        exec("insertstring", 1, '"');
-        assert.equal(editor.getValue(), '("")');
-        exec("backspace", 1);
-        exec("insertstring", 1, '"');
-        assert.equal(editor.getValue(), '("")');
-        
-        editor.setValue("('foo')", 1);
-        exec("gotoleft", 1);
-        exec("selectleft", 1);
-        exec("selectMoreBefore", 1);
-        exec("insertstring", 1, "'");
-        assert.equal(editor.getValue(), "('foo')");
-        exec("selectleft", 1);
-        exec("insertstring", 1, '"');
-        assert.equal(editor.getValue(), '("foo")');
-        exec("selectleft", 1);
-        exec("insertstring", 1, '"');
-        assert.equal(editor.getValue(), '("foo")');
-        
-        editor.setValue("", 1);
-        exec("selectleft", 1);
-        exec("insertstring", 1, '"');
-        assert.equal(editor.getValue(), '""');
-        exec("insertstring", 1, '\\');
-        exec("insertstring", 1, 'n');
-        exec("insertstring", 1, '"');
-        assert.equal(editor.getValue(), '"\\n"');
-        
-    },
-    "test: xml": function() {
-        editor = new Editor(new MockRenderer());
-        editor.setValue(["<OuterTag>",
-            "    <SelfClosingTag />"
-        ].join("\n"));
-        editor.session.setMode(new XMLMode);
-        exec("gotolinedown", 1);
-        exec("gotolineend", 1);
-        exec("insertstring", 1, '\n');
-        assert.equal(editor.session.getLine(2), "    ");
-        exec("gotolineup", 1);
-        exec("gotolineend", 1);
-        exec("insertstring", 1, '\n');
-        assert.equal(editor.session.getLine(2), "    ");
+        assert.equal(editor.getValue(), "{\n    \n}")
    }
 };

--- a/lib/ace/mode/behaviour/cstyle.js
+++ b/lib/ace/mode/behaviour/cstyle.js
@ -63,19 +63,6 @@ var initContext = function(editor) {
    };
 };

-var getWrapped = function(selection, selected, opening, closing) {
-    var rowDiff = selection.end.row - selection.start.row;
-    return {
-        text: opening + selected + closing,
-        selection: [
-                0,
-                selection.start.column + 1,
-                rowDiff,
-                selection.end.column + (rowDiff ? 0 : 1)
-            ]
-    };
-};
-
 var CstyleBehaviour = function() {
    this.add("braces", "insertion", function(state, action, editor, session, text) {
        var cursor = editor.getCursorPosition();
@ -85,7 +72,10 @@ var CstyleBehaviour = function() {
            var selection = editor.getSelectionRange();
            var selected = session.doc.getTextRange(selection);
            if (selected !== "" && selected !== "{" && editor.getWrapBehavioursEnabled()) {
-                return getWrapped(selection, selected, '{', '}');
+                return {
+                    text: '{' + selected + '}',
+                    selection: false
+                };
            } else if (CstyleBehaviour.isSaneInsertion(editor, session)) {
                if (/[\]\}\)]/.test(line[cursor.column]) || editor.inMultiSelectMode) {
                    CstyleBehaviour.recordAutoInsert(editor, session, "}");
@ -165,7 +155,10 @@ var CstyleBehaviour = function() {
            var selection = editor.getSelectionRange();
            var selected = session.doc.getTextRange(selection);
            if (selected !== "" && editor.getWrapBehavioursEnabled()) {
-                return getWrapped(selection, selected, '(', ')');
+                return {
+                    text: '(' + selected + ')',
+                    selection: false
+                };
            } else if (CstyleBehaviour.isSaneInsertion(editor, session)) {
                CstyleBehaviour.recordAutoInsert(editor, session, ")");
                return {
@ -210,7 +203,10 @@ var CstyleBehaviour = function() {
            var selection = editor.getSelectionRange();
            var selected = session.doc.getTextRange(selection);
            if (selected !== "" && editor.getWrapBehavioursEnabled()) {
-                return getWrapped(selection, selected, '[', ']');
+                return {
+                    text: '[' + selected + ']',
+                    selection: false
+                };
            } else if (CstyleBehaviour.isSaneInsertion(editor, session)) {
                CstyleBehaviour.recordAutoInsert(editor, session, "]");
                return {
@ -256,45 +252,56 @@ var CstyleBehaviour = function() {
            var selection = editor.getSelectionRange();
            var selected = session.doc.getTextRange(selection);
            if (selected !== "" && selected !== "'" && selected != '"' && editor.getWrapBehavioursEnabled()) {
-                return getWrapped(selection, selected, quote, quote);
-            } else if (!selected) {
+                return {
+                    text: quote + selected + quote,
+                    selection: false
+                };
+            } else {
                var cursor = editor.getCursorPosition();
                var line = session.doc.getLine(cursor.row);
                var leftChar = line.substring(cursor.column-1, cursor.column);
-                var rightChar = line.substring(cursor.column, cursor.column + 1);
-                
-                var token = session.getTokenAt(cursor.row, cursor.column);
-                var rightToken = session.getTokenAt(cursor.row, cursor.column + 1);
+
                // We're escaped.
-                if (leftChar == "\\" && token && /escape/.test(token.type))
+                if (leftChar == '\\') {
                    return null;
-                
-                var stringBefore = token && /string|escape/.test(token.type);
-                var stringAfter = !rightToken || /string|escape/.test(rightToken.type);
-                
-                var pair;
-                if (rightChar == quote) {
-                    pair = stringBefore !== stringAfter;
-                } else {
-                    if (stringBefore && !stringAfter)
-                        return null; // wrap string with different quote
-                    if (stringBefore && stringAfter)
-                        return null; // do not pair quotes inside strings
-                    var wordRe = session.$mode.tokenRe;
-                    wordRe.lastIndex = 0;
-                    var isWordBefore = wordRe.test(leftChar);
-                    wordRe.lastIndex = 0;
-                    var isWordAfter = wordRe.test(leftChar);
-                    if (isWordBefore || isWordAfter)
-                        return null; // before or after alphanumeric
-                    if (rightChar && !/[\s;,.})\]\\]/.test(rightChar))
-                        return null; // there is rightChar and it isn't closing
-                    pair = true;
                }
-                return {
-                    text: pair ? quote + quote : "",
-                    selection: [1,1]
-                };
+
+                // Find what token we're inside.
+                var tokens = session.getTokens(selection.start.row);
+                var col = 0, token;
+                var quotepos = -1; // Track whether we're inside an open quote.
+
+                for (var x = 0; x < tokens.length; x++) {
+                    token = tokens[x];
+                    if (token.type == "string") {
+                      quotepos = -1;
+                    } else if (quotepos < 0) {
+                      quotepos = token.value.indexOf(quote);
+                    }
+                    if ((token.value.length + col) > selection.start.column) {
+                        break;
+                    }
+                    col += tokens[x].value.length;
+                }
+
+                // Try and be smart about when we auto insert.
+                if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf(quote) === token.value.length-1)))) {
+                    if (!CstyleBehaviour.isSaneInsertion(editor, session))
+                        return;
+                    return {
+                        text: quote + quote,
+                        selection: [1,1]
+                    };
+                } else if (token && token.type === "string") {
+                    // Ignore input and move right one if we're typing over the closing quote.
+                    var rightChar = line.substring(cursor.column, cursor.column + 1);
+                    if (rightChar == quote) {
+                        return {
+                            text: '',
+                            selection: [1, 1]
+                        };
+                    }
+                }
            }
        }
    });
--- a/Show more
+++ b/Show more