From b659af9962e9e42b12aa630d232ab00f564386c0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 23 Mar 2015 12:26:24 +0100
Subject: [PATCH 01/72] Bump version number post-5.1.0

---
 bower.json        | 2 +-
 doc/manual.html   | 2 +-
 doc/releases.html | 2 --
 lib/codemirror.js | 2 +-
 package.json      | 2 +-
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/bower.json b/bower.json
index 334447e56d..d49cf34d70 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version":"5.1.0",
+  "version":"5.1.1",
   "main": ["lib/codemirror.js", "lib/codemirror.css"],
   "ignore": [
     "**/.*",
diff --git a/doc/manual.html b/doc/manual.html
index fbf366df2b..7ba8a8dc91 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -63,7 +63,7 @@
 <section class=first id=overview>
     <h2 style="position: relative">
       User manual and reference guide
-      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.1.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.1.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/doc/releases.html b/doc/releases.html
index c3f2afe062..1ca06d016d 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -41,8 +41,6 @@
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/5.0.0...5.1.0">list of patches</a>.</li>
   </ul>
 
-  <h2>Version 5.x</h2>
-
   <p class="rel">20-02-2015: <a href="http://codemirror.net/codemirror-5.0.zip">Version 5.0</a>:</p>
 
   <ul class="rel-note">
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 33f8f8f1a5..0f98291892 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8679,7 +8679,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.1.0";
+  CodeMirror.version = "5.1.1";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index a5c7cd093f..5c953fdd72 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.1.0",
+    "version":"5.1.1",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From dc4936332c3ca355694e6269cc08e618e0dc3652 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 24 Mar 2015 10:18:48 +0100
Subject: [PATCH 02/72] Add a hack to catch Firefox context-menu undo

Issue #3142
---
 lib/codemirror.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 0f98291892..58e7cd0c96 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1385,12 +1385,9 @@
       }
 
       if (cm.doc.sel == cm.display.selForContextMenu) {
-        if (text.charCodeAt(0) == 0x200b) {
-          if (!prevInput) prevInput = "\u200b";
-        } else if (prevInput == "\u200b") {
-          text = text.slice(1);
-          prevInput = "";
-        }
+        var first = text.charCodeAt(0);
+        if (first == 0x200b && !prevInput) prevInput = "\u200b";
+        if (first == 0x21da) { this.reset(); return this.cm.execCommand("undo"); }
       }
       // Find the part of the input that is actually new
       var same = 0, l = Math.min(prevInput.length, text.length);
@@ -1449,6 +1446,7 @@
       function prepareSelectAllHack() {
         if (te.selectionStart != null) {
           var selected = cm.somethingSelected();
+          te.value = "\u21da"; // Used to catch context-menu undo
           var extval = te.value = "\u200b" + (selected ? te.value : "");
           input.prevInput = selected ? "" : "\u200b";
           te.selectionStart = 1; te.selectionEnd = extval.length;

From 79e162b51c1fa023fac7f4e138b01d81ee4f37a0 Mon Sep 17 00:00:00 2001
From: ju1ius <jules.bernable@laposte.net>
Date: Mon, 23 Mar 2015 14:59:07 +0100
Subject: [PATCH 03/72] [panel addon] Add more options for panel positioning

---
 addon/display/panel.js |  30 +++++++++---
 demo/panel.html        | 130 +++++++++++++++++++++++++++++++++++++++----------
 doc/manual.html        |  36 ++++++++++++--
 3 files changed, 159 insertions(+), 37 deletions(-)

diff --git a/addon/display/panel.js b/addon/display/panel.js
index 22c0453e8f..d84b8c1465 100644
--- a/addon/display/panel.js
+++ b/addon/display/panel.js
@@ -10,13 +10,31 @@
     mod(CodeMirror);
 })(function(CodeMirror) {
   CodeMirror.defineExtension("addPanel", function(node, options) {
-    if (!this.state.panels) initPanels(this);
+    options = options || {};
 
-    var info = this.state.panels;
-    if (options && options.position == "bottom")
-      info.wrapper.appendChild(node);
-    else
-      info.wrapper.insertBefore(node, info.wrapper.firstChild);
+    if (!this.state.panels) {
+      initPanels(this);
+    }
+    var info = this.state.panels,
+        wrapper = info.wrapper,
+        cmWrapper = this.getWrapperElement()
+    ;
+    if (options.after && options.after instanceof Panel && !options.after.cleared) {
+      wrapper.insertBefore(node, options.before.node.nextSibling);
+    } else if (options.before && options.before instanceof Panel && !options.before.cleared) {
+      wrapper.insertBefore(node, options.before.node);
+    } else if (options.replace && options.replace instanceof Panel && !options.replace.cleared) {
+      wrapper.insertBefore(node, options.replace.node);
+      options.replace.clear();
+    } else if (options.position === "bottom") {
+      wrapper.appendChild(node);
+    } else if (options.position === "before-bottom") {
+      wrapper.insertBefore(node, cmWrapper.nextSibling);
+    } else if (options.position === "after-top") {
+      wrapper.insertBefore(node, cmWrapper);
+    } else {
+      wrapper.insertBefore(node, wrapper.firstChild);
+    }
     var height = (options && options.height) || node.offsetHeight;
     this._setSize(null, info.heightLeft -= height);
     info.panels++;
diff --git a/demo/panel.html b/demo/panel.html
index 7f4bbefca6..c91cd50baa 100644
--- a/demo/panel.html
+++ b/demo/panel.html
@@ -7,17 +7,36 @@
 <link rel="stylesheet" href="../lib/codemirror.css">
 <script src="../lib/codemirror.js"></script>
 <script src="../mode/javascript/javascript.js"></script>
+<script src="../mode/xml/xml.js"></script>
+<script src="../mode/htmlmixed/htmlmixed.js"></script>
 <script src="../addon/display/panel.js"></script>
 <style type="text/css">
-  .border {border: 1px solid black; border-bottom: 1px solid black;}
-  .add { background: orange; padding: 1px 3px; color: white !important; border-radius: 4px; }
+  .border {
+    border: 1px solid #f7f7f7;
+  }
+  .add-panel {
+    background: orange;
+    padding: 3px 6px;
+    color: white !important; 
+    border-radius: 3px;
+  }
+  .add-panel, .remove-panel {
+    cursor: pointer;
+  }
+  .remove-panel {
+    float: right;
+  }
   .panel {
-    background-image: linear-gradient(to bottom, #ffffaa, #ffffdd);
+    background: #f7f7f7;
     padding: 3px 7px;
+    font-size: 0.85em;
+  }
+  .panel.top, .panel.after-top {
+    border-bottom: 1px solid #ddd;
+  }
+  .panel.bottom, .panel.before-bottom {
+    border-top: 1px solid #ddd;
   }
-  .panel.top { border-bottom: 1px solid #dd6; }
-  .panel.bottom { border-top: 1px solid #dd6; }
-  .panel span { cursor: pointer; }
 </style>
 
 <div id=nav>
@@ -34,31 +53,88 @@
 </div>
 
 <article>
+
 <h2>Panel Demo</h2>
-<form><div class="border"><textarea id="code" name="code"></textarea></div></form>
 
-<script id="localscript">var textarea = document.getElementById("code");
-var script = document.getElementById("localscript");
-textarea.value = (script.textContent ||
-                  script.innerText ||
-                  script.innerHTML);
+<div class="border">
+    <textarea id="code" name="code"></textarea>
+</div>
+
+<p>
+  The <a href="../doc/manual.html#addon_panel"><code>panel</code></a>
+  addon allows you to display panels above or below an editor.
+  <br>
+  Click the links below to add panels at the given position:
+</p>
+
+<div id="demo">
+<p>
+  <a class="add-panel" onclick="addPanel('top', true)">top</a>
+  <a class="add-panel" onclick="addPanel('after-top', true)">after-top</a>
+  <a class="add-panel" onclick="addPanel('before-bottom', true)">before-bottom</a>
+  <a class="add-panel" onclick="addPanel('bottom', true)">bottom</a>
+</p>
+<p>
+  You can also replace an existing panel:
+</p>
+<form onsubmit="return replacePanel(this);" name="replace_panel">
+  <input type="submit" value="Replace panel n°" />
+  <input type="number" name="panel_id" min="1" value="1" />
+</form>
+
+<script>
+var textarea = document.getElementById("code"),
+    demo = document.getElementById("demo"),
+    numPanels = 0,
+    panels = {},
+    editor
+;
+textarea.value = demo.innerHTML.trim();
 editor = CodeMirror.fromTextArea(textarea, {
-  lineNumbers: true
+  lineNumbers: true,
+  mode: 'htmlmixed'
 });
 
-function addPanel(where) {
-  var node = document.createElement("div");
-  node.className = "panel " + where;
-  var close = node.appendChild(document.createElement("span"));
-  close.textContent = "✖ Remove this panel";
-  var widget = editor.addPanel(node, {position: where});
-  CodeMirror.on(close, "click", function() { widget.clear(); });
-}</script>
-
-<p>The <a href="../doc/manual.html#addon_panel"><code>panel</code></a>
-addon allows you to display panels <a class=add
-href="javascript:addPanel('top')">above</a> or <a class=add
-href="javascript:addPanel('bottom')">below</a> an editor. Click the
-links in the previous paragraph to add panels to the editor.</p>
+function makePanel(where, removable) {
+  var node = document.createElement("div"),
+      id = ++numPanels,
+      widget, close, label
+  ;
+  node.id = 'panel-' + id;
+  node.className = "panel " + where + (removable ? ' removable' : '');
+  if (removable) {
+    close = node.appendChild(document.createElement("a"));
+    close.setAttribute('title', 'Remove me!');
+    close.setAttribute('class', 'remove-panel');
+    close.textContent = "✖";
+    CodeMirror.on(close, "click", function() {
+      panels[node.id].clear();
+    });
+  }
+  label = node.appendChild(document.createElement('span'));
+  label.textContent = "I'm panel n°" + id;
+  return node;
+}
+function addPanel (where, removable) {
+  var node = makePanel(where, removable);
+  panels[node.id] = editor.addPanel(node, {position: where});
+}
+
+addPanel('top', false);
+addPanel('bottom', false);
+
+function replacePanel (form) {
+  var id = form.elements.panel_id.value,
+      panel = panels['panel-' + id],
+      node = makePanel('', true)
+  ;
+  panels[node.id] = editor.addPanel(node, {replace: panel, position: 'after-top'});
+
+  return false;
+}
+</script>
+
+</div>
+
 
 </article>
diff --git a/doc/manual.html b/doc/manual.html
index 7ba8a8dc91..6728512c78 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2764,13 +2764,41 @@ <h2 id="addons">Addons</h2>
       instances, which places a DOM node above or below an editor, and
       shrinks the editor to make room for the node. The method takes
       as first argument as DOM node, and as second an optional options
-      object. By default, the panel ends up above the editor. This can
-      be changed by passing a <code>position</code> option with the
-      value <code>"bottom"</code>. The object returned by this method
+      object. The <code>Panel</code> object returned by this method
       has a <code>clear</code> method that is used to remove the
       panel, and a <code>changed</code> method that can be used to
       notify the addon when the size of the panel's DOM node has
-      changed.</dd>
+      changed.<br/>
+      The method accepts the following options:
+      <dl>
+          <dt><code><strong>position</strong> : string</code></dt>
+          <dd>
+              Controls the position of the newly added panel.
+              The following values are recognized:
+              <dl>
+                  <dt><code><strong>top</strong> (default)</code></dt>
+                  <dd>Adds the panel at the very top.</dd>
+                  <dt><code><strong>after-top</strong></code></dt>
+                  <dd>Adds the panel at the bottom of the top panels.</dd>
+                  <dt><code><strong>bottom</strong></code></dt>
+                  <dd>Adds the panel at the very bottom.</dd>
+                  <dt><code><strong>before-bottom</strong></code></dt>
+                  <dd>Adds the panel at the top of the bottom panels.</dd>
+              </dl>
+          </dd>
+          <dt><code><strong>before</strong> : Panel</code></dt>
+          <dd>The new panel will be added before the given panel.</dd>
+          <dt><code><strong>after</strong> : Panel</code></dt>
+          <dd>The new panel will be added after the given panel.</dd>
+          <dt><code><strong>replace</strong> : Panel</code></dt>
+          <dd>The new panel will replace the given panel.</dd>
+      </dl>
+      When using the <code>after</code>, <code>before</code> or <code>replace</code> options,
+      if the panel doesn't exists or has been removed,
+      the value of the <code>position</code> option will be used as a fallback.
+      <br>
+      A demo of the addon is available <a href="../demo/panel.html">here</a>.
+      </dd>
 
       <dt id="addon_hardwrap"><a href="../addon/wrap/hardwrap.js"><code>wrap/hardwrap.js</code></a></dt>
       <dd>Addon to perform hard line wrapping/breaking for paragraphs

From e0cf6f8d3854731645387df6339fa55579eedd60 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 24 Mar 2015 10:44:20 +0100
Subject: [PATCH 04/72] [panel addon] Make coding style conform

---
 addon/display/panel.js | 26 +++++++++---------
 demo/panel.html        | 74 ++++++++++++++++++++++++--------------------------
 doc/manual.html        | 41 ++++++++++++++--------------
 3 files changed, 68 insertions(+), 73 deletions(-)

diff --git a/addon/display/panel.js b/addon/display/panel.js
index d84b8c1465..ba29484d6c 100644
--- a/addon/display/panel.js
+++ b/addon/display/panel.js
@@ -12,29 +12,29 @@
   CodeMirror.defineExtension("addPanel", function(node, options) {
     options = options || {};
 
-    if (!this.state.panels) {
-      initPanels(this);
-    }
-    var info = this.state.panels,
-        wrapper = info.wrapper,
-        cmWrapper = this.getWrapperElement()
-    ;
-    if (options.after && options.after instanceof Panel && !options.after.cleared) {
+    if (!this.state.panels) initPanels(this);
+
+    var info = this.state.panels;
+    var wrapper = info.wrapper;
+    var cmWrapper = this.getWrapperElement();
+
+    if (options.after instanceof Panel && !options.after.cleared) {
       wrapper.insertBefore(node, options.before.node.nextSibling);
-    } else if (options.before && options.before instanceof Panel && !options.before.cleared) {
+    } else if (options.before instanceof Panel && !options.before.cleared) {
       wrapper.insertBefore(node, options.before.node);
-    } else if (options.replace && options.replace instanceof Panel && !options.replace.cleared) {
+    } else if (options.replace instanceof Panel && !options.replace.cleared) {
       wrapper.insertBefore(node, options.replace.node);
       options.replace.clear();
-    } else if (options.position === "bottom") {
+    } else if (options.position == "bottom") {
       wrapper.appendChild(node);
-    } else if (options.position === "before-bottom") {
+    } else if (options.position == "before-bottom") {
       wrapper.insertBefore(node, cmWrapper.nextSibling);
-    } else if (options.position === "after-top") {
+    } else if (options.position == "after-top") {
       wrapper.insertBefore(node, cmWrapper);
     } else {
       wrapper.insertBefore(node, wrapper.firstChild);
     }
+
     var height = (options && options.height) || node.offsetHeight;
     this._setSize(null, info.heightLeft -= height);
     info.panels++;
diff --git a/demo/panel.html b/demo/panel.html
index c91cd50baa..b3b0b7ca6b 100644
--- a/demo/panel.html
+++ b/demo/panel.html
@@ -69,10 +69,10 @@
 
 <div id="demo">
 <p>
-  <a class="add-panel" onclick="addPanel('top', true)">top</a>
-  <a class="add-panel" onclick="addPanel('after-top', true)">after-top</a>
-  <a class="add-panel" onclick="addPanel('before-bottom', true)">before-bottom</a>
-  <a class="add-panel" onclick="addPanel('bottom', true)">bottom</a>
+  <a class="add-panel" onclick="addPanel('top')">top</a>
+  <a class="add-panel" onclick="addPanel('after-top')">after-top</a>
+  <a class="add-panel" onclick="addPanel('before-bottom')">before-bottom</a>
+  <a class="add-panel" onclick="addPanel('bottom')">bottom</a>
 </p>
 <p>
   You can also replace an existing panel:
@@ -83,58 +83,54 @@
 </form>
 
 <script>
-var textarea = document.getElementById("code"),
-    demo = document.getElementById("demo"),
-    numPanels = 0,
-    panels = {},
-    editor
-;
+var textarea = document.getElementById("code");
+var demo = document.getElementById("demo");
+var numPanels = 0;
+var panels = {};
+var editor;
+
 textarea.value = demo.innerHTML.trim();
 editor = CodeMirror.fromTextArea(textarea, {
   lineNumbers: true,
-  mode: 'htmlmixed'
+  mode: "htmlmixed"
 });
 
-function makePanel(where, removable) {
-  var node = document.createElement("div"),
-      id = ++numPanels,
-      widget, close, label
-  ;
-  node.id = 'panel-' + id;
-  node.className = "panel " + where + (removable ? ' removable' : '');
-  if (removable) {
-    close = node.appendChild(document.createElement("a"));
-    close.setAttribute('title', 'Remove me!');
-    close.setAttribute('class', 'remove-panel');
-    close.textContent = "✖";
-    CodeMirror.on(close, "click", function() {
-      panels[node.id].clear();
-    });
-  }
-  label = node.appendChild(document.createElement('span'));
+function makePanel(where) {
+  var node = document.createElement("div");
+  var id = ++numPanels;
+  var widget, close, label;
+
+  node.id = "panel-" + id;
+  node.className = "panel " + where;
+  close = node.appendChild(document.createElement("a"));
+  close.setAttribute("title", "Remove me!");
+  close.setAttribute("class", "remove-panel");
+  close.textContent = "✖";
+  CodeMirror.on(close, "click", function() {
+    panels[node.id].clear();
+  });
+  label = node.appendChild(document.createElement("span"));
   label.textContent = "I'm panel n°" + id;
   return node;
 }
-function addPanel (where, removable) {
-  var node = makePanel(where, removable);
+function addPanel(where) {
+  var node = makePanel(where);
   panels[node.id] = editor.addPanel(node, {position: where});
 }
 
-addPanel('top', false);
-addPanel('bottom', false);
+addPanel("top");
+addPanel("bottom");
 
-function replacePanel (form) {
-  var id = form.elements.panel_id.value,
-      panel = panels['panel-' + id],
-      node = makePanel('', true)
-  ;
-  panels[node.id] = editor.addPanel(node, {replace: panel, position: 'after-top'});
+function replacePanel(form) {
+  var id = form.elements.panel_id.value;
+  var panel = panels["panel-" + id];
+  var node = makePanel("");
 
+  panels[node.id] = editor.addPanel(node, {replace: panel, position: "after-top"});
   return false;
 }
 </script>
 
 </div>
 
-
 </article>
diff --git a/doc/manual.html b/doc/manual.html
index 6728512c78..1a315f5220 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2771,27 +2771,26 @@ <h2 id="addons">Addons</h2>
       changed.<br/>
       The method accepts the following options:
       <dl>
-          <dt><code><strong>position</strong> : string</code></dt>
-          <dd>
-              Controls the position of the newly added panel.
-              The following values are recognized:
-              <dl>
-                  <dt><code><strong>top</strong> (default)</code></dt>
-                  <dd>Adds the panel at the very top.</dd>
-                  <dt><code><strong>after-top</strong></code></dt>
-                  <dd>Adds the panel at the bottom of the top panels.</dd>
-                  <dt><code><strong>bottom</strong></code></dt>
-                  <dd>Adds the panel at the very bottom.</dd>
-                  <dt><code><strong>before-bottom</strong></code></dt>
-                  <dd>Adds the panel at the top of the bottom panels.</dd>
-              </dl>
-          </dd>
-          <dt><code><strong>before</strong> : Panel</code></dt>
-          <dd>The new panel will be added before the given panel.</dd>
-          <dt><code><strong>after</strong> : Panel</code></dt>
-          <dd>The new panel will be added after the given panel.</dd>
-          <dt><code><strong>replace</strong> : Panel</code></dt>
-          <dd>The new panel will replace the given panel.</dd>
+        <dt><code><strong>position</strong> : string</code></dt>
+        <dd>Controls the position of the newly added panel. The
+        following values are recognized:
+          <dl>
+            <dt><code><strong>top</strong> (default)</code></dt>
+            <dd>Adds the panel at the very top.</dd>
+            <dt><code><strong>after-top</strong></code></dt>
+            <dd>Adds the panel at the bottom of the top panels.</dd>
+            <dt><code><strong>bottom</strong></code></dt>
+            <dd>Adds the panel at the very bottom.</dd>
+            <dt><code><strong>before-bottom</strong></code></dt>
+            <dd>Adds the panel at the top of the bottom panels.</dd>
+          </dl>
+        </dd>
+        <dt><code><strong>before</strong> : Panel</code></dt>
+        <dd>The new panel will be added before the given panel.</dd>
+        <dt><code><strong>after</strong> : Panel</code></dt>
+        <dd>The new panel will be added after the given panel.</dd>
+        <dt><code><strong>replace</strong> : Panel</code></dt>
+        <dd>The new panel will replace the given panel.</dd>
       </dl>
       When using the <code>after</code>, <code>before</code> or <code>replace</code> options,
       if the panel doesn't exists or has been removed,

From 8b5e6594f7a4156248945d64bdf4e40d49d63702 Mon Sep 17 00:00:00 2001
From: Martin Hunt <martin@gameclosure.com>
Date: Mon, 23 Mar 2015 22:08:20 -0700
Subject: [PATCH 05/72] [lint addon] add support for jshint globals option

`options` with a `globals` key as defined in a standard `.jshintrc` is actually separated into two arguments to the `JSHINT` function in the `jshint` cli: `https://github.com/gameclosure/jshint/blob/master/src/cli.js#L487`.  This forwards `options.globals` properly to `JSHINT`.
---
 addon/lint/javascript-lint.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/lint/javascript-lint.js b/addon/lint/javascript-lint.js
index 3d65ba695b..d4f2ae9a1f 100644
--- a/addon/lint/javascript-lint.js
+++ b/addon/lint/javascript-lint.js
@@ -23,7 +23,7 @@
 
   function validator(text, options) {
     if (!window.JSHINT) return [];
-    JSHINT(text, options);
+    JSHINT(text, options, options.globals);
     var errors = JSHINT.data().errors, result = [];
     if (errors) parseErrors(errors, result);
     return result;

From e0fb2b314a641112fcc339473f4c1173cdefe74e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 25 Mar 2015 22:52:40 +0100
Subject: [PATCH 06/72] Fix cut/copy from context menu

Issue #3142
---
 lib/codemirror.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 58e7cd0c96..22032f1864 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1446,8 +1446,9 @@
       function prepareSelectAllHack() {
         if (te.selectionStart != null) {
           var selected = cm.somethingSelected();
+          var extval = "\u200b" + (selected ? te.value : "");
           te.value = "\u21da"; // Used to catch context-menu undo
-          var extval = te.value = "\u200b" + (selected ? te.value : "");
+          te.value = extval;
           input.prevInput = selected ? "" : "\u200b";
           te.selectionStart = 1; te.selectionEnd = extval.length;
           // Re-set this, in case some other handler touched the

From f741b59e53f14f4ed218e849212b8b9b65391d2e Mon Sep 17 00:00:00 2001
From: Chris Lohfink <clohfink@users.noreply.github.com>
Date: Wed, 25 Mar 2015 21:29:04 -0500
Subject: [PATCH 07/72] [sql mode] Update for CQL 3.1

---
 mode/sql/sql.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index ee6c194b0e..1d434b7cbb 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -327,9 +327,9 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
   CodeMirror.defineMIME("text/x-cassandra", {
     name: "sql",
     client: { },
-    keywords: set("use select from using consistency where limit first reversed first and in insert into values using consistency ttl update set delete truncate begin batch apply create keyspace with columnfamily primary key index on drop alter type add any one quorum all local_quorum each_quorum"),
-    builtin: set("ascii bigint blob boolean counter decimal double float int text timestamp uuid varchar varint"),
-    atoms: set("false true"),
+    keywords: set("add all allow alter and any apply as asc authorize batch begin by clustering columnfamily compact consistency count create custom delete desc distinct drop each_quorum exists filtering from grant if in index insert into key keyspace keyspaces level limit local_one local_quorum modify nan norecursive nosuperuser not of on one order password permission permissions primary quorum rename revoke schema select set storage superuser table three to token truncate ttl two type unlogged update use user users using values where with writetime"),
+    builtin: set("ascii bigint blob boolean counter decimal double float frozen inet int list map static text timestamp timeuuid tuple uuid varchar varint"),
+    atoms: set("false true infinity NaN"),
     operatorChars: /^[<>=]/,
     dateSQL: { },
     support: set("commentSlashSlash decimallessFloat"),

From 8757ba27ae8f61e9c3ec27badb418cbf25f60b93 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 26 Mar 2015 09:10:10 +0100
Subject: [PATCH 08/72] Prevent select-all from firing when picking undo from
 context menu on Webkit

Issue #3142
---
 lib/codemirror.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 22032f1864..285bdb14a5 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1466,7 +1466,8 @@
         if (te.selectionStart != null) {
           if (!ie || (ie && ie_version < 9)) prepareSelectAllHack();
           var i = 0, poll = function() {
-            if (display.selForContextMenu == cm.doc.sel && te.selectionStart == 0 && input.prevInput == "\u200b")
+            if (display.selForContextMenu == cm.doc.sel && te.selectionStart == 0 &&
+                te.selectionEnd > 0 && input.prevInput == "\u200b")
               operation(cm, commands.selectAll)(cm);
             else if (i++ < 10) display.detectingSelectAll = setTimeout(poll, 500);
             else display.input.reset();

From c8c77044916b2ec737449bc2cc8e8d25ac634a61 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 29 Mar 2015 12:40:32 +0200
Subject: [PATCH 09/72] [tern demo] Fix loading of Acorn scripts

Closes #3159
---
 demo/tern.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/demo/tern.html b/demo/tern.html
index 19135faf7f..d5badfef6e 100644
--- a/demo/tern.html
+++ b/demo/tern.html
@@ -13,9 +13,9 @@
 <script src="../addon/dialog/dialog.js"></script>
 <script src="../addon/hint/show-hint.js"></script>
 <script src="../addon/tern/tern.js"></script>
-<script src="http://marijnhaverbeke.nl/acorn/acorn.js"></script>
-<script src="http://marijnhaverbeke.nl/acorn/acorn_loose.js"></script>
-<script src="http://marijnhaverbeke.nl/acorn/util/walk.js"></script>
+<script src="http://ternjs.net/node_modules/acorn/dist/acorn.js"></script>
+<script src="http://ternjs.net/node_modules/acorn/dist/acorn_loose.js"></script>
+<script src="http://ternjs.net/node_modules/acorn/dist/walk.js"></script>
 <script src="http://ternjs.net/doc/demo/polyfill.js"></script>
 <script src="http://ternjs.net/lib/signal.js"></script>
 <script src="http://ternjs.net/lib/tern.js"></script>

From ba90b7104c9fbaee908ab31a95caff9e1b7bf72b Mon Sep 17 00:00:00 2001
From: Nick Kreeger <kreeger@google.com>
Date: Fri, 27 Mar 2015 14:06:03 -0700
Subject: [PATCH 10/72] [monokai & solarized themes] Less saturated colors for
 variable tokens

---
 theme/monokai.css   | 2 +-
 theme/solarized.css | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/theme/monokai.css b/theme/monokai.css
index 6dfcc73ce4..d70bb86f29 100644
--- a/theme/monokai.css
+++ b/theme/monokai.css
@@ -18,7 +18,7 @@
 .cm-s-monokai span.cm-keyword {color: #f92672;}
 .cm-s-monokai span.cm-string {color: #e6db74;}
 
-.cm-s-monokai span.cm-variable {color: #a6e22e;}
+.cm-s-monokai span.cm-variable {color: #f8f8f2;}
 .cm-s-monokai span.cm-variable-2 {color: #9effff;}
 .cm-s-monokai span.cm-def {color: #fd971f;}
 .cm-s-monokai span.cm-bracket {color: #f8f8f2;}
diff --git a/theme/solarized.css b/theme/solarized.css
index 4a10b7c059..9db3951579 100644
--- a/theme/solarized.css
+++ b/theme/solarized.css
@@ -53,7 +53,7 @@ http://ethanschoonover.com/solarized/img/solarized-palette.png
 .cm-s-solarized .cm-number { color: #d33682; }
 .cm-s-solarized .cm-def { color: #2aa198; }
 
-.cm-s-solarized .cm-variable { color: #268bd2; }
+.cm-s-solarized .cm-variable { color: #839496; }
 .cm-s-solarized .cm-variable-2 { color: #b58900; }
 .cm-s-solarized .cm-variable-3 { color: #6c71c4; }
 

From 92d0d3dfc5e7c3fe7ec4d98061b3bf7708854e9d Mon Sep 17 00:00:00 2001
From: Daniele Di Sarli <danieleds0@gmail.com>
Date: Thu, 26 Mar 2015 12:22:45 +0100
Subject: [PATCH 11/72] [searchcursor addon] Add origin parameter to replace
 method

---
 addon/search/searchcursor.js | 4 ++--
 doc/manual.html              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addon/search/searchcursor.js b/addon/search/searchcursor.js
index 55c108b5a3..97088bf1cf 100644
--- a/addon/search/searchcursor.js
+++ b/addon/search/searchcursor.js
@@ -148,10 +148,10 @@
     from: function() {if (this.atOccurrence) return this.pos.from;},
     to: function() {if (this.atOccurrence) return this.pos.to;},
 
-    replace: function(newText) {
+    replace: function(newText, origin) {
       if (!this.atOccurrence) return;
       var lines = CodeMirror.splitLines(newText);
-      this.doc.replaceRange(lines, this.pos.from, this.pos.to);
+      this.doc.replaceRange(lines, this.pos.from, this.pos.to, origin);
       this.pos.to = Pos(this.pos.from.line + lines.length - 1,
                         lines[lines.length - 1].length + (lines.length == 1 ? this.pos.from.ch : 0));
     }
diff --git a/doc/manual.html b/doc/manual.html
index 1a315f5220..955a89511d 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2175,7 +2175,7 @@ <h2 id="addons">Addons</h2>
           to <code>findNext</code> or <code>findPrevious</code> did
           not return false. They will return <code>{line, ch}</code>
           objects pointing at the start and end of the match.</dd>
-          <dt><code><strong>replace</strong>(text: string)</code></dt>
+          <dt><code><strong>replace</strong>(text: string, ?origin: string)</code></dt>
           <dd>Replaces the currently found match with the given text
           and adjusts the cursor position to reflect the
           replacement.</dd>

From 225bd97de2088c133f3b626a9aa0ca81884e6ff7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 29 Mar 2015 13:18:55 +0200
Subject: [PATCH 12/72] [javascript mode] Properly recognize 'as' in import
 specs

Closes #3154
---
 mode/javascript/javascript.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index bee88997be..4c55b9e8e8 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -583,9 +583,14 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     return pass(importSpec, maybeFrom);
   }
   function importSpec(type, value) {
+    console.log("is", type, value)
     if (type == "{") return contCommasep(importSpec, "}");
     if (type == "variable") register(value);
-    return cont();
+    if (value == "*") cx.marked = "keyword";
+    return cont(maybeAs);
+  }
+  function maybeAs(_type, value) {
+    if (value == "as") { cx.marked = "keyword"; return cont(importSpec); }
   }
   function maybeFrom(_type, value) {
     if (value == "from") { cx.marked = "keyword"; return cont(expression); }

From 46057686ac2992a61463c0cd499d0a6f5550d7f5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 29 Mar 2015 13:37:14 +0200
Subject: [PATCH 13/72] Remove debug statement

---
 mode/javascript/javascript.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 4c55b9e8e8..ef0184789a 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -583,7 +583,6 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     return pass(importSpec, maybeFrom);
   }
   function importSpec(type, value) {
-    console.log("is", type, value)
     if (type == "{") return contCommasep(importSpec, "}");
     if (type == "variable") register(value);
     if (value == "*") cx.marked = "keyword";

From 6c27bc7ca179a98869d341eaaf4539ce68036337 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 30 Mar 2015 09:48:37 +0200
Subject: [PATCH 14/72] [show-hint addon] Allow recovery from typo that causes
 no matching completions

Backspace now brings back the completion widget.

Closes #3162
---
 addon/hint/show-hint.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index f544619428..88ab5d9e78 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -110,15 +110,15 @@
 
       function update() {
         if (finished) return;
-        CodeMirror.signal(data, "update");
+        if (data) CodeMirror.signal(data, "update");
         retrieveHints(completion.options.hint, completion.cm, completion.options, finishUpdate);
       }
       function finishUpdate(data_) {
         data = data_;
         if (finished) return;
-        if (!data || !data.list.length) return done();
         if (completion.widget) completion.widget.close();
-        completion.widget = new Widget(completion, data);
+        if (data && data.list.length)
+          completion.widget = new Widget(completion, data);
       }
 
       function clearDebounce() {

From e29fecf2127bae8924d13beb06f37d9fed91d739 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 30 Mar 2015 10:55:08 +0200
Subject: [PATCH 15/72] [show-hint addon] Don't hide completion widget while
 waiting for update

And do capture enter presses in this time to allow
quickfire completion.

Issue #3157
---
 addon/hint/show-hint.js | 35 ++++++++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 88ab5d9e78..35686df35b 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -91,7 +91,7 @@
       this.widget = new Widget(this, data);
       CodeMirror.signal(data, "shown");
 
-      var debounce = 0, completion = this, finished;
+      var debounce = 0, completion = this, tick = 0;
       var closeOn = this.options.closeCharacters;
       var startPos = this.cm.getCursor(), startLen = this.cm.getLine(startPos.line).length;
 
@@ -101,24 +101,29 @@
       var cancelAnimationFrame = window.cancelAnimationFrame || clearTimeout;
 
       function done() {
-        if (finished) return;
-        finished = true;
+        if (tick == null) return;
+        tick = null;
         completion.close();
         completion.cm.off("cursorActivity", activity);
         if (data) CodeMirror.signal(data, "close");
       }
 
-      function update() {
-        if (finished) return;
+      function update(myTick) {
+        if (tick == null) return;
+        var myTick = ++tick;
         if (data) CodeMirror.signal(data, "update");
-        retrieveHints(completion.options.hint, completion.cm, completion.options, finishUpdate);
+        retrieveHints(completion.options.hint, completion.cm, completion.options,
+                      function(d) { finishUpdate(d, myTick); });
       }
-      function finishUpdate(data_) {
+      function finishUpdate(data_, myTick) {
+        if (tick != myTick) return;
         data = data_;
-        if (finished) return;
+        var picked = completion.widget && completion.widget.picked;
         if (completion.widget) completion.widget.close();
-        if (data && data.list.length)
-          completion.widget = new Widget(completion, data);
+        if (data && data.list.length) {
+          if (picked && data.list.length == 1) completion.pick(data, 0);
+          else completion.widget = new Widget(completion, data);
+        }
       }
 
       function clearDebounce() {
@@ -137,7 +142,7 @@
           completion.close();
         } else {
           debounce = requestAnimationFrame(update);
-          if (completion.widget) completion.widget.close();
+          if (completion.widget) completion.widget.disable();
         }
       }
       this.cm.on("cursorActivity", activity);
@@ -206,6 +211,7 @@
   function Widget(completion, data) {
     this.completion = completion;
     this.data = data;
+    this.picked = false;
     var widget = this, cm = completion.cm;
 
     var hints = this.hints = document.createElement("ul");
@@ -320,6 +326,13 @@
       cm.off("scroll", this.onScroll);
     },
 
+    disable: function() {
+      this.completion.cm.removeKeyMap(this.keyMap);
+      var widget = this;
+      this.keyMap = {Enter: function() { widget.picked = true; }};
+      this.completion.cm.addKeyMap(this.keyMap);
+    },
+
     pick: function() {
       this.completion.pick(this.data, this.selectedHint);
     },

From 2dd1762dacf08738a9efce0aa12a31776c59f804 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 31 Mar 2015 09:47:23 +0200
Subject: [PATCH 16/72] Use alt as the copy modifier for dragging text on Mac

Issue #3151
---
 lib/codemirror.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 285bdb14a5..4eeaacd096 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3770,7 +3770,7 @@
       try {
         var text = e.dataTransfer.getData("Text");
         if (text) {
-          if (cm.state.draggingText && !(mac ? e.metaKey : e.ctrlKey))
+          if (cm.state.draggingText && !(mac ? e.altKey : e.ctrlKey))
             var selected = cm.listSelections();
           setSelectionNoUndo(cm.doc, simpleSelection(pos, pos));
           if (selected) for (var i = 0; i < selected.length; ++i)

From 12dbe838c9af3062b8a60db4c7534da179d004a7 Mon Sep 17 00:00:00 2001
From: Marcel Gerber <mg.hain@gmx.de>
Date: Mon, 30 Mar 2015 12:50:32 +0200
Subject: [PATCH 17/72] [less mode] Enable interpolation

---
 mode/css/css.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mode/css/css.js b/mode/css/css.js
index bed1517e8c..11c1a81e3e 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -750,6 +750,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
         }
       },
       "@": function(stream) {
+        if (stream.eat("{")) return [null, "interpolation"];
         if (stream.match(/^(charset|document|font-face|import|(-(moz|ms|o|webkit)-)?keyframes|media|namespace|page|supports)\b/, false)) return false;
         stream.eatWhile(/[\w\\\-]/);
         if (stream.match(/^\s*:/, false))

From 26ec5f3710f028afb97fa1567d6e13f79999b910 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 31 Mar 2015 09:56:03 +0200
Subject: [PATCH 18/72] [css mode] Fix Less-style interpolation

Issue #3164
---
 mode/css/css.js       | 3 ++-
 mode/css/less_test.js | 3 +++
 mode/css/scss_test.js | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index 11c1a81e3e..7fc9098fbc 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -328,7 +328,8 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
   states.interpolation = function(type, stream, state) {
     if (type == "}") return popContext(state);
     if (type == "{" || type == ";") return popAndPass(type, stream, state);
-    if (type != "variable") override = "error";
+    if (type == "word") override = "variable";
+    else if (type != "variable") override = "error";
     return "interpolation";
   };
 
diff --git a/mode/css/less_test.js b/mode/css/less_test.js
index 2ba69984f3..66ccb3f22b 100644
--- a/mode/css/less_test.js
+++ b/mode/css/less_test.js
@@ -48,4 +48,7 @@
      "    }",
      "  }",
      "}");
+
+
+  MT("interpolation", ".@{[variable foo]} { [property font-weight]: [atom bold]; }")
 })();
diff --git a/mode/css/scss_test.js b/mode/css/scss_test.js
index 8dcea9e86e..26c226a1ea 100644
--- a/mode/css/scss_test.js
+++ b/mode/css/scss_test.js
@@ -73,7 +73,7 @@
     "[tag foo]#{[variable-2 $hello]} { [property color]:[atom #000]; }");
 
   MT('interpolation_error',
-    "[tag foo]#{[error foo]} { [property color]:[atom #000]; }");
+    "[tag foo]#{[variable foo]} { [property color]:[atom #000]; }");
 
   MT("divide_operator",
     "[tag foo] { [property width]:[number 4] [operator /] [number 2] }");

From 31bcedce5ac1ffb4ac6cd8f2d1f4a6b3ad6d422f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 31 Mar 2015 10:01:54 +0200
Subject: [PATCH 19/72] Fix linter

---
 mode/css/less_test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/css/less_test.js b/mode/css/less_test.js
index 66ccb3f22b..7b77f58488 100644
--- a/mode/css/less_test.js
+++ b/mode/css/less_test.js
@@ -50,5 +50,5 @@
      "}");
 
 
-  MT("interpolation", ".@{[variable foo]} { [property font-weight]: [atom bold]; }")
+  MT("interpolation", ".@{[variable foo]} { [property font-weight]: [atom bold]; }");
 })();

From f70a83367465eafc5e14931d599c868f4baa49cd Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 31 Mar 2015 11:46:27 +0200
Subject: [PATCH 20/72] Allow dragDrop option to be dynamically changed

Issue #3167
---
 lib/codemirror.js | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 4eeaacd096..96c8f7e417 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3400,15 +3400,11 @@
     // Prevent wrapper from ever scrolling
     on(d.wrapper, "scroll", function() { d.wrapper.scrollTop = d.wrapper.scrollLeft = 0; });
 
-    function drag_(e) {
-      if (!signalDOMEvent(cm, e)) e_stop(e);
-    }
-    if (cm.options.dragDrop) {
-      on(d.scroller, "dragstart", function(e){onDragStart(cm, e);});
-      on(d.scroller, "dragenter", drag_);
-      on(d.scroller, "dragover", drag_);
-      on(d.scroller, "drop", operation(cm, onDrop));
-    }
+    d.dragFunctions = {
+      simple: function(e) {if (!signalDOMEvent(cm, e)) e_stop(e);},
+      start: function(e){onDragStart(cm, e);},
+      drop: operation(cm, onDrop)
+    };
 
     var inp = d.input.getField();
     on(inp, "keyup", function(e) { onKeyUp.call(cm, e); });
@@ -3418,6 +3414,18 @@
     on(inp, "blur", bind(onBlur, cm));
   }
 
+  function dragDropChanged(cm, value, old) {
+    var wasOn = old && old != CodeMirror.Init;
+    if (!value != !wasOn) {
+      var funcs = cm.display.dragFunctions;
+      var toggle = value ? on : off;
+      toggle(cm.display.scroller, "dragstart", funcs.start);
+      toggle(cm.display.scroller, "dragenter", funcs.simple);
+      toggle(cm.display.scroller, "dragover", funcs.simple);
+      toggle(cm.display.scroller, "drop", funcs.drop);
+    }
+  }
+
   // Called when the window resizes
   function onResize(cm) {
     var d = cm.display;
@@ -5282,7 +5290,7 @@
     }
   });
   option("disableInput", false, function(cm, val) {if (!val) cm.display.input.reset();}, true);
-  option("dragDrop", true);
+  option("dragDrop", true, dragDropChanged);
 
   option("cursorBlinkRate", 530);
   option("cursorScrollMargin", 0);

From c0b371cf5f059d105b8152921b6cb2c79bd88a73 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 31 Mar 2015 12:12:55 +0200
Subject: [PATCH 21/72] Delay focusing of textarea to end of operation when
 possible

So that the hidden textarea is actually near the cursor when it gets focused,
and doesn't cause weird scroll jumps.
---
 lib/codemirror.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 96c8f7e417..62d07c37ab 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2919,6 +2919,7 @@
       updateMaxLine: false,    // Set when the widest line needs to be determined anew
       scrollLeft: null, scrollTop: null, // Intermediate scroll position, not pushed to DOM yet
       scrollToPos: null,       // Used to scroll to a specific position
+      focus: false,
       id: ++nextOpId           // Unique ID
     };
     if (operationGroup) {
@@ -3036,6 +3037,7 @@
 
     if (cm.state.focused && op.updateInput)
       cm.display.input.reset(op.typing);
+    if (op.focus) ensureFocus(op.cm);
   }
 
   function endOperation_finish(op) {
@@ -3515,7 +3517,7 @@
   var lastClick, lastDoubleClick;
   function leftButtonDown(cm, e, start) {
     if (ie) setTimeout(bind(ensureFocus, cm), 0);
-    else ensureFocus(cm);
+    else cm.curOp.focus = true;
 
     var now = +new Date, type;
     if (lastDoubleClick && lastDoubleClick.time > now - 400 && cmp(lastDoubleClick.pos, start) == 0) {
@@ -3675,7 +3677,7 @@
       var cur = posFromMouse(cm, e, true, type == "rect");
       if (!cur) return;
       if (cmp(cur, lastPos) != 0) {
-        ensureFocus(cm);
+        cm.curOp.focus = true;
         extendTo(cur);
         var visible = visibleLines(display, doc);
         if (cur.line >= visible.to || cur.line < visible.from)
@@ -4033,7 +4035,7 @@
   var lastStoppedKey = null;
   function onKeyDown(e) {
     var cm = this;
-    ensureFocus(cm);
+    cm.curOp.focus = true;
     if (signalDOMEvent(cm, e)) return;
     // IE does strange things with escape.
     if (ie && ie_version < 11 && e.keyCode == 27) e.returnValue = false;

From f16e63816dda2245c837aca1b9feb43dfdbb04e1 Mon Sep 17 00:00:00 2001
From: LloydMilligan <Lloyd@SeaIslandSystems.com>
Date: Tue, 31 Mar 2015 12:08:54 -0400
Subject: [PATCH 22/72] [mumps mode] Add

---
 mode/mumps/index.html |  86 +++++++++++++++
 mode/mumps/mumps.js   | 283 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 369 insertions(+)
 create mode 100644 mode/mumps/index.html
 create mode 100644 mode/mumps/mumps.js

diff --git a/mode/mumps/index.html b/mode/mumps/index.html
new file mode 100644
index 0000000000..b0f6d06679
--- /dev/null
+++ b/mode/mumps/index.html
@@ -0,0 +1,86 @@
+<!doctype html>
+
+<title>CodeMirror: MUMPS mode</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="../../doc/docs.css">
+
+<link rel="stylesheet" href="../../lib/codemirror.css">
+<script src="../../lib/codemirror.js"></script>
+<script src="mumps.js"></script>
+<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+<div id=nav>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+
+  <ul>
+    <li><a href="../../index.html">Home</a>
+    <li><a href="../../doc/manual.html">Manual</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">MUMPS</a>
+  </ul>
+</div>
+
+<article>
+<h2>MUMPS mode</h2>
+
+
+<div><textarea id="code" name="code">
+ ; Lloyd Milligan
+ ; 03-30-2015
+ ;
+ ; MUMPS support for Code Mirror - Excerpts below from routine ^XUS
+ ;
+CHECKAV(X1) ;Check A/V code return DUZ or Zero. (Called from XUSRB)
+ N %,%1,X,Y,IEN,DA,DIK
+ S IEN=0
+ ;Start CCOW
+ I $E(X1,1,7)="~~TOK~~" D  Q:IEN>0 IEN
+ . I $E(X1,8,9)="~1" S IEN=$$CHKASH^XUSRB4($E(X1,8,255))
+ . I $E(X1,8,9)="~2" S IEN=$$CHKCCOW^XUSRB4($E(X1,8,255))
+ . Q
+ ;End CCOW
+ S X1=$$UP(X1) S:X1[":" XUTT=1,X1=$TR(X1,":")
+ S X=$P(X1,";") Q:X="^" -1 S:XUF %1="Access: "_X
+ Q:X'?1.20ANP 0
+ S X=$$EN^XUSHSH(X) I '$D(^VA(200,"A",X)) D LBAV Q 0
+ S %1="",IEN=$O(^VA(200,"A",X,0)),XUF(.3)=IEN D USER(IEN)
+ S X=$P(X1,";",2) S:XUF %1="Verify: "_X S X=$$EN^XUSHSH(X)
+ I $P(XUSER(1),"^",2)'=X D LBAV Q 0
+ I $G(XUFAC(1)) S DIK="^XUSEC(4,",DA=XUFAC(1) D ^DIK
+ Q IEN
+ ;
+ ; Spell out commands
+ ;
+SET2() ;EF. Return error code (also called from XUSRB)
+ NEW %,X
+ SET XUNOW=$$HTFM^XLFDT($H),DT=$P(XUNOW,".")
+ KILL DUZ,XUSER
+ SET (DUZ,DUZ(2))=0,(DUZ(0),DUZ("AG"),XUSER(0),XUSER(1),XUTT,%UCI)=""
+ SET %=$$INHIBIT^XUSRB() IF %>0 QUIT %
+ SET X=$G(^%ZIS(1,XUDEV,"XUS")),XU1=$G(^(1))
+ IF $L(X) FOR I=1:1:15 IF $L($P(X,U,I)) SET $P(XOPT,U,I)=$P(X,U,I)
+ SET DTIME=600
+ IF '$P(XOPT,U,11),$D(^%ZIS(1,XUDEV,90)),^(90)>2800000,^(90)'>DT QUIT 8
+ QUIT 0
+ ;
+ ; Spell out commands and functions
+ ;
+ IF $PIECE(XUSER(0),U,11),$PIECE(XUSER(0),U,11)'>DT QUIT 11 ;Terminated
+ IF $DATA(DUZ("ASH")) QUIT 0 ;If auto handle, Allow to sign-on p434
+ IF $PIECE(XUSER(0),U,7) QUIT 5 ;Disuser flag set
+ IF '$LENGTH($PIECE(XUSER(1),U,2)) QUIT 21 ;p419, p434
+ Q 0
+ ;
+  </textarea>
+    <script>
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+         mode: "mumps",
+         lineNumbers: true,
+         lineWrapping: true,
+         smartIndent: false
+      });
+    </script>
+
+  </article>
diff --git a/mode/mumps/mumps.js b/mode/mumps/mumps.js
new file mode 100644
index 0000000000..7e6d60a92f
--- /dev/null
+++ b/mode/mumps/mumps.js
@@ -0,0 +1,283 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+
+/*
+	This MUMPS Language script was constructed using vbscript.js as a template.
+	Modified lines are generally annotated, or deleted and replaced by lines
+        annotated // SIS.
+*/
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("mumps", function(conf, parserConf) {
+    var ERRORCLASS = 'error';
+
+    function wordRegexp(words) {
+        return new RegExp("^((" + words.join(")|(") + "))\\b", "i");
+    }
+
+    var singleOperators = new RegExp("^[\\+\\-\\*/&#!_?\\\\<>=\\'\\[\\]]"); // SIS - Modified
+    var doubleOperators = new RegExp("^(('=)|(<=)|(>=)|('>)|('<)|([[)|(]])|(^$))"); // SIS - Modified
+    var singleDelimiters = new RegExp('^[\\.,:]'); //SIS - Add ':'
+    var brakets = new RegExp('^[\\(\\)]');
+    var identifiers = new RegExp("^[%A-Za-z][A-Za-z0-9]*"); // SIS - Modified
+    var singletons = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ%'; // SIS - Kludge
+    var commandKeywords = ['break','close','do','else','for','goto', 'halt', 'hang', 'if', 'job','kill','lock','merge','new','open', 'quit', 'read', 'set', 'tcommit', 'trollback', 'tstart', 'use', 'view', 'write', 'xecute', 'b','c','d','e','f','g', 'h', 'i', 'j','k','l','m','n','o', 'q', 'r', 's', 'tc', 'tro', 'ts', 'u', 'v', 'w', 'x'];
+    //SIS - The following list includes instrinsic functions _and_ special variables
+    var intrinsicFuncsWords = ['\\$ascii', '\\$char', '\\$data', '\\$ecode', '\\$estack', '\\$etrap', '\\$extract', '\\$find', '\\$fnumber', '\\$get', '\\$horolog', '\\$io', '\\$increment', '\\$job', '\\$justify', '\\$length', '\\$name', '\\$next', '\\$order', '\\$piece', '\\$qlength', '\\$qsubscript', '\\$query', '\\$quit', '\\$random', '\\$reverse', '\\$select', '\\$stack', '\\$test', '\\$text', '\\$translate', '\\$view', '\\$x', '\\$y', '\\$a', '\\$c', '\\$d', '\\$e', '\\$ec', '\\$es', '\\$et', '\\$f', '\\$fn', '\\$g', '\\$h', '\\$i', '\\$j', '\\$l', '\\$n', '\\$na', '\\$o', '\\$p', '\\$q', '\\$ql', '\\$qs', '\\$r', '\\$re', '\\$s', '\\$st', '\\$t', '\\$tr', '\\$v', '\\$z'];
+    var intrinsicFuncs = wordRegexp(intrinsicFuncsWords);
+    var stringPrefixes = '"';
+    var command = wordRegexp(commandKeywords);
+    var label = false; // SIS - Line label context
+    var commandMode=0; // SIS - MUMPS requires exactly one space between command and argument
+ 
+    // SIS - Indent would apply to DO blocks but is not implemented.
+    function indent(_stream, state) {
+      state.currentIndent++;
+    }
+
+    function dedent(_stream, state) { // SIS See note above
+      state.currentIndent--;
+    }
+
+    // tokenizers
+    function tokenBase(stream, state) {
+
+	if (stream.sol()) {
+	    label = true;
+            commandMode = 0;
+	}
+
+	// SIS - The <space> character has meaning in MUMPS. Ignoring consecutive
+	// spaces would interfere with interpreting whether the next non-space
+	// character belongs to the command or argument context.
+
+	// Examine each character and update a mode variable whose interpretation is:
+	//   >0 => command    0 => argument    <0 => command post-conditional
+
+/*
+        if (stream.eatSpace()) {
+            return 'space';
+        }
+*/
+
+	var ch = stream.peek();
+	if (ch === '\t') ch = ' ';	// SIS - Convert <tab> to <space>
+
+	if (ch == ' ') {		//     - Pre-process <space>
+	    label = false;
+	    if (commandMode == 0)
+		commandMode = 1;
+	    else if ((commandMode < 0) || (commandMode == 2))
+		commandMode = 0;
+	}
+	else if ((ch != '.') && (commandMode > 0)) {
+		if (ch == ':')
+		    commandMode = -1;	// SIS - Command post-conditional
+		else
+		    commandMode = 2;
+	}
+
+	// SIS - End of <space> character processing 
+	
+
+	if ((ch === "(") || (ch === '\u0009')) {  // SIS Do not color parameter list as line tag
+	    label = false;
+	}
+
+        // SIS - MUMPS comment starts with ';'
+        if (ch === ";") {	 // SIS - Replace single quote with semi-colon ("'" with ";")
+            stream.skipToEnd();
+            return 'variable-3'; // SIS - CM default comment is brown - Want M default to be green
+        }
+
+        // Number Literals // SIS/RLM - MUMPS permits canonic number followed by concatenate operator
+        if (stream.match(/^((&H)|(&O))?[0-9\.]/i, false) && !stream.match(/^((&H)|(&O))?[0-9\.]+[a-z]/i, false)) {
+            var floatLiteral = false;
+            // Floats
+            if (stream.match(/^\d*\.\d+/i)) { floatLiteral = true; }
+            else if (stream.match(/^\d+\.\d*/)) { floatLiteral = true; }
+            else if (stream.match(/^\.\d+/)) { floatLiteral = true; }
+
+            if (floatLiteral) {
+                // Float literals may be "imaginary"
+                stream.eat(/J/i);
+                return 'number';
+            }
+            // Integers
+            var intLiteral = false;
+            // Hex
+            if (stream.match(/^&H[0-9a-f]+/i)) { intLiteral = true; }
+            // Octal
+            else if (stream.match(/^&O[0-7]+/i)) { intLiteral = true; }
+            // Decimal
+            else if (stream.match(/^[1-9]\d*F?/)) {
+                // Decimal literals may be "imaginary"
+                stream.eat(/J/i);
+                // TODO - Can you have imaginary longs?
+                intLiteral = true;
+            }
+            // Zero by itself with no other piece of number.
+            else if (stream.match(/^0(?![\dx])/i)) { intLiteral = true; }
+            if (intLiteral) {
+                // Integer literals may be "long"
+                stream.eat(/L/i);
+                return 'number';
+            }
+        }
+
+        // Handle Strings
+        if (stream.match(stringPrefixes)) {
+            state.tokenize = tokenStringFactory(stream.current());
+            return state.tokenize(stream, state);
+        }
+
+        // Handle operators and Delimiters
+        if (stream.match(doubleOperators)
+            || stream.match(singleOperators)) {
+            //return 'operator';
+            return 'variable-3';  // SIS - More salient than 'operator' in typical MUMPS contexts 
+        }
+
+        //SIS - Prevents leading '.' in DO block from falling through to error
+        if (stream.match(singleDelimiters)) {
+            return null;
+        }
+
+
+        if (stream.match(brakets)) {
+            return "bracket";
+        }
+
+        if (stream.match(command) && (commandMode > 0)) {
+            if (! state.doInCurrentLine)
+              indent(stream,state);
+            else
+              state.doInCurrentLine = false;
+ 	    return 'header';    // SIS - Another empirical color choice - best blue for command
+        }
+
+        if (stream.match(intrinsicFuncs)) {
+	    return 'keyword'; // SIS - See note above
+        }
+
+        if (stream.match(identifiers)) {
+            return 'variable';
+        }
+
+	// SIS - Detect dollar-sign when not a documented intrinsic function
+        if (ch === "$") {  // Start of extrinsic function
+	    stream.next();
+            return 'keyword';
+        }
+
+	// SIS - '^' may introduce a GVN or SSVN - Color same as function
+        if (ch === "^") {
+	    stream.next();
+            return 'keyword';
+        }
+
+	// SIS - MUMPS Indirection
+        if (ch === "@") {
+	    stream.next();
+            return 'string-2'; // SIS - Same idea... Want orange for indirection
+        }
+
+	if (singletons.indexOf(ch) != -1) {  //SIS - Don't understand why kludge is needed
+ 	    //stream.next();
+            return 'variable';
+	}
+
+        // Handle non-detected items
+        stream.next();
+        return ERRORCLASS;
+    }
+
+    function tokenStringFactory(delimiter) {
+        var singleline = delimiter.length == 1;
+        var OUTCLASS = 'string';
+
+        return function(stream, state) {
+            while (!stream.eol()) {
+                stream.eatWhile(/[^'"]/);
+                if (stream.match(delimiter)) {
+                    state.tokenize = tokenBase;
+                    return OUTCLASS;
+                } else {
+                    stream.eat(/['"]/);
+                }
+            }
+            if (singleline) {
+                if (parserConf.singleLineStringErrors) {
+                    return ERRORCLASS;
+                } else {
+                    state.tokenize = tokenBase;
+                }
+            }
+            return OUTCLASS;
+        };
+    }
+
+    //SIS - MUMPS does not have '.' delimited identifiers
+    function tokenLexer(stream, state) {
+        var style = state.tokenize(stream, state);
+	// SIS - code removed here
+        return style;
+    }
+
+    var external = {
+        //electricChars:"dDpPtTfFeE ",	//SIS - Only auto-indent on period
+	electricChars:".",		//SIS - Disregard - Smart indent is OFF
+        startState: function() {
+            return {
+              tokenize: tokenBase,
+              lastToken: null,
+              currentIndent: 0,
+              nextLineIndent: 0,
+              doInCurrentLine: false,
+              ignoreKeyword: false
+
+
+          };
+        },
+
+        token: function(stream, state) {
+            if (stream.sol()) {
+              state.currentIndent += state.nextLineIndent;
+              state.nextLineIndent = 0;
+              state.doInCurrentLine = 0;
+            }
+            var style = tokenLexer(stream, state);
+
+            state.lastToken = {style:style, content: stream.current()};
+
+            if (style==='space') style=null;
+
+	    if (label) return 'invalidchar'; // SIS - Line tags should default to red
+					     //       They are not invalid, of course
+            return style;
+        },
+
+        indent: function(state, textAfter) {
+            var trueText = textAfter.replace(/^\s+|\s+$/g, '') ;
+            if (trueText.match(closing) || trueText.match(middle)) return conf.indentUnit*(state.currentIndent-1);
+            if(state.currentIndent < 0) return 0;
+            return state.currentIndent * conf.indentUnit;
+        }
+
+    };
+    return external;
+});
+
+CodeMirror.defineMIME("text/mumps", "mumps");	 // SIS - Don't know what this does.
+
+});

From dd2d5f3d1a0d80a8feeb3a721f99c253316c794c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 31 Mar 2015 21:46:34 +0200
Subject: [PATCH 23/72] [mumps mode] Clean up and integrate

---
 doc/compress.html     |   1 +
 mode/index.html       |   1 +
 mode/meta.js          |   1 +
 mode/mumps/index.html |   3 +-
 mode/mumps/mumps.js   | 349 ++++++++++++++++----------------------------------
 5 files changed, 111 insertions(+), 244 deletions(-)

diff --git a/doc/compress.html b/doc/compress.html
index 65df6483f5..daed505ac3 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -149,6 +149,7 @@
           <option value="http://codemirror.net/mode/mirc/mirc.js">mirc.js</option>
           <option value="http://codemirror.net/mode/mllike/mllike.js">mllike.js</option>
           <option value="http://codemirror.net/mode/modelica/modelica.js">modelica.js</option>
+          <option value="http://codemirror.net/mode/mumps/mumps.js">mumps.js</option>
           <option value="http://codemirror.net/mode/nginx/nginx.js">nginx.js</option>
           <option value="http://codemirror.net/mode/ntriples/ntriples.js">ntriples.js</option>
           <option value="http://codemirror.net/mode/octave/octave.js">octave.js</option>
diff --git a/mode/index.html b/mode/index.html
index 7b62a33cf2..422c8233b5 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -77,6 +77,7 @@
       <li><a href="markdown/index.html">Markdown</a> (<a href="gfm/index.html">GitHub-flavour</a>)</li>
       <li><a href="mirc/index.html">mIRC</a></li>
       <li><a href="modelica/index.html">Modelica</a></li>
+      <li><a href="mumps/index.html">MUMPS</a></li>
       <li><a href="nginx/index.html">Nginx</a></li>
       <li><a href="ntriples/index.html">NTriples</a></li>
       <li><a href="clike/index.html">Objective C</a></li>
diff --git a/mode/meta.js b/mode/meta.js
index d138809179..6c988e226d 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -73,6 +73,7 @@
     {name: "mIRC", mime: "text/mirc", mode: "mirc"},
     {name: "MariaDB SQL", mime: "text/x-mariadb", mode: "sql"},
     {name: "Modelica", mime: "text/x-modelica", mode: "modelica", ext: ["mo"]},
+    {name: "MUMPS", mime: "text/x-mumps", mode: "mumps"},
     {name: "MS SQL", mime: "text/x-mssql", mode: "sql"},
     {name: "MySQL", mime: "text/x-mysql", mode: "sql"},
     {name: "Nginx", mime: "text/x-nginx-conf", mode: "nginx", file: /nginx.*\.conf$/i},
diff --git a/mode/mumps/index.html b/mode/mumps/index.html
index b0f6d06679..bd1f69aef5 100644
--- a/mode/mumps/index.html
+++ b/mode/mumps/index.html
@@ -78,8 +78,7 @@
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
          mode: "mumps",
          lineNumbers: true,
-         lineWrapping: true,
-         smartIndent: false
+         lineWrapping: true
       });
     </script>
 
diff --git a/mode/mumps/mumps.js b/mode/mumps/mumps.js
index 7e6d60a92f..469f8c3d1c 100644
--- a/mode/mumps/mumps.js
+++ b/mode/mumps/mumps.js
@@ -1,11 +1,8 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
-
 /*
-	This MUMPS Language script was constructed using vbscript.js as a template.
-	Modified lines are generally annotated, or deleted and replaced by lines
-        annotated // SIS.
+  This MUMPS Language script was constructed using vbscript.js as a template.
 */
 
 (function(mod) {
@@ -16,268 +13,136 @@
   else // Plain browser env
     mod(CodeMirror);
 })(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("mumps", function(conf, parserConf) {
-    var ERRORCLASS = 'error';
+  "use strict";
 
+  CodeMirror.defineMode("mumps", function() {
     function wordRegexp(words) {
-        return new RegExp("^((" + words.join(")|(") + "))\\b", "i");
+      return new RegExp("^((" + words.join(")|(") + "))\\b", "i");
     }
 
-    var singleOperators = new RegExp("^[\\+\\-\\*/&#!_?\\\\<>=\\'\\[\\]]"); // SIS - Modified
-    var doubleOperators = new RegExp("^(('=)|(<=)|(>=)|('>)|('<)|([[)|(]])|(^$))"); // SIS - Modified
-    var singleDelimiters = new RegExp('^[\\.,:]'); //SIS - Add ':'
-    var brakets = new RegExp('^[\\(\\)]');
-    var identifiers = new RegExp("^[%A-Za-z][A-Za-z0-9]*"); // SIS - Modified
-    var singletons = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ%'; // SIS - Kludge
-    var commandKeywords = ['break','close','do','else','for','goto', 'halt', 'hang', 'if', 'job','kill','lock','merge','new','open', 'quit', 'read', 'set', 'tcommit', 'trollback', 'tstart', 'use', 'view', 'write', 'xecute', 'b','c','d','e','f','g', 'h', 'i', 'j','k','l','m','n','o', 'q', 'r', 's', 'tc', 'tro', 'ts', 'u', 'v', 'w', 'x'];
-    //SIS - The following list includes instrinsic functions _and_ special variables
-    var intrinsicFuncsWords = ['\\$ascii', '\\$char', '\\$data', '\\$ecode', '\\$estack', '\\$etrap', '\\$extract', '\\$find', '\\$fnumber', '\\$get', '\\$horolog', '\\$io', '\\$increment', '\\$job', '\\$justify', '\\$length', '\\$name', '\\$next', '\\$order', '\\$piece', '\\$qlength', '\\$qsubscript', '\\$query', '\\$quit', '\\$random', '\\$reverse', '\\$select', '\\$stack', '\\$test', '\\$text', '\\$translate', '\\$view', '\\$x', '\\$y', '\\$a', '\\$c', '\\$d', '\\$e', '\\$ec', '\\$es', '\\$et', '\\$f', '\\$fn', '\\$g', '\\$h', '\\$i', '\\$j', '\\$l', '\\$n', '\\$na', '\\$o', '\\$p', '\\$q', '\\$ql', '\\$qs', '\\$r', '\\$re', '\\$s', '\\$st', '\\$t', '\\$tr', '\\$v', '\\$z'];
+    var singleOperators = new RegExp("^[\\+\\-\\*/&#!_?\\\\<>=\\'\\[\\]]");
+    var doubleOperators = new RegExp("^(('=)|(<=)|(>=)|('>)|('<)|([[)|(]])|(^$))");
+    var singleDelimiters = new RegExp("^[\\.,:]");
+    var brackets = new RegExp("[()]");
+    var identifiers = new RegExp("^[%A-Za-z][A-Za-z0-9]*");
+    var commandKeywords = ["break","close","do","else","for","goto", "halt", "hang", "if", "job","kill","lock","merge","new","open", "quit", "read", "set", "tcommit", "trollback", "tstart", "use", "view", "write", "xecute", "b","c","d","e","f","g", "h", "i", "j","k","l","m","n","o", "q", "r", "s", "tc", "tro", "ts", "u", "v", "w", "x"];
+    // The following list includes instrinsic functions _and_ special variables
+    var intrinsicFuncsWords = ["\\$ascii", "\\$char", "\\$data", "\\$ecode", "\\$estack", "\\$etrap", "\\$extract", "\\$find", "\\$fnumber", "\\$get", "\\$horolog", "\\$io", "\\$increment", "\\$job", "\\$justify", "\\$length", "\\$name", "\\$next", "\\$order", "\\$piece", "\\$qlength", "\\$qsubscript", "\\$query", "\\$quit", "\\$random", "\\$reverse", "\\$select", "\\$stack", "\\$test", "\\$text", "\\$translate", "\\$view", "\\$x", "\\$y", "\\$a", "\\$c", "\\$d", "\\$e", "\\$ec", "\\$es", "\\$et", "\\$f", "\\$fn", "\\$g", "\\$h", "\\$i", "\\$j", "\\$l", "\\$n", "\\$na", "\\$o", "\\$p", "\\$q", "\\$ql", "\\$qs", "\\$r", "\\$re", "\\$s", "\\$st", "\\$t", "\\$tr", "\\$v", "\\$z"];
     var intrinsicFuncs = wordRegexp(intrinsicFuncsWords);
-    var stringPrefixes = '"';
     var command = wordRegexp(commandKeywords);
-    var label = false; // SIS - Line label context
-    var commandMode=0; // SIS - MUMPS requires exactly one space between command and argument
- 
-    // SIS - Indent would apply to DO blocks but is not implemented.
-    function indent(_stream, state) {
-      state.currentIndent++;
-    }
 
-    function dedent(_stream, state) { // SIS See note above
-      state.currentIndent--;
-    }
-
-    // tokenizers
     function tokenBase(stream, state) {
-
-	if (stream.sol()) {
-	    label = true;
-            commandMode = 0;
-	}
-
-	// SIS - The <space> character has meaning in MUMPS. Ignoring consecutive
-	// spaces would interfere with interpreting whether the next non-space
-	// character belongs to the command or argument context.
-
-	// Examine each character and update a mode variable whose interpretation is:
-	//   >0 => command    0 => argument    <0 => command post-conditional
-
-/*
-        if (stream.eatSpace()) {
-            return 'space';
-        }
-*/
-
-	var ch = stream.peek();
-	if (ch === '\t') ch = ' ';	// SIS - Convert <tab> to <space>
-
-	if (ch == ' ') {		//     - Pre-process <space>
-	    label = false;
-	    if (commandMode == 0)
-		commandMode = 1;
-	    else if ((commandMode < 0) || (commandMode == 2))
-		commandMode = 0;
-	}
-	else if ((ch != '.') && (commandMode > 0)) {
-		if (ch == ':')
-		    commandMode = -1;	// SIS - Command post-conditional
-		else
-		    commandMode = 2;
-	}
-
-	// SIS - End of <space> character processing 
-	
-
-	if ((ch === "(") || (ch === '\u0009')) {  // SIS Do not color parameter list as line tag
-	    label = false;
-	}
-
-        // SIS - MUMPS comment starts with ';'
-        if (ch === ";") {	 // SIS - Replace single quote with semi-colon ("'" with ";")
-            stream.skipToEnd();
-            return 'variable-3'; // SIS - CM default comment is brown - Want M default to be green
-        }
-
-        // Number Literals // SIS/RLM - MUMPS permits canonic number followed by concatenate operator
-        if (stream.match(/^((&H)|(&O))?[0-9\.]/i, false) && !stream.match(/^((&H)|(&O))?[0-9\.]+[a-z]/i, false)) {
-            var floatLiteral = false;
-            // Floats
-            if (stream.match(/^\d*\.\d+/i)) { floatLiteral = true; }
-            else if (stream.match(/^\d+\.\d*/)) { floatLiteral = true; }
-            else if (stream.match(/^\.\d+/)) { floatLiteral = true; }
-
-            if (floatLiteral) {
-                // Float literals may be "imaginary"
-                stream.eat(/J/i);
-                return 'number';
-            }
-            // Integers
-            var intLiteral = false;
-            // Hex
-            if (stream.match(/^&H[0-9a-f]+/i)) { intLiteral = true; }
-            // Octal
-            else if (stream.match(/^&O[0-7]+/i)) { intLiteral = true; }
-            // Decimal
-            else if (stream.match(/^[1-9]\d*F?/)) {
-                // Decimal literals may be "imaginary"
-                stream.eat(/J/i);
-                // TODO - Can you have imaginary longs?
-                intLiteral = true;
-            }
-            // Zero by itself with no other piece of number.
-            else if (stream.match(/^0(?![\dx])/i)) { intLiteral = true; }
-            if (intLiteral) {
-                // Integer literals may be "long"
-                stream.eat(/L/i);
-                return 'number';
-            }
-        }
-
-        // Handle Strings
-        if (stream.match(stringPrefixes)) {
-            state.tokenize = tokenStringFactory(stream.current());
-            return state.tokenize(stream, state);
-        }
-
-        // Handle operators and Delimiters
-        if (stream.match(doubleOperators)
-            || stream.match(singleOperators)) {
-            //return 'operator';
-            return 'variable-3';  // SIS - More salient than 'operator' in typical MUMPS contexts 
-        }
-
-        //SIS - Prevents leading '.' in DO block from falling through to error
-        if (stream.match(singleDelimiters)) {
-            return null;
+      if (stream.sol()) {
+        state.label = true;
+        state.commandMode = 0;
+      }
+
+      // The <space> character has meaning in MUMPS. Ignoring consecutive
+      // spaces would interfere with interpreting whether the next non-space
+      // character belongs to the command or argument context.
+
+      // Examine each character and update a mode variable whose interpretation is:
+      //   >0 => command    0 => argument    <0 => command post-conditional
+      var ch = stream.peek();
+
+      if (ch == " " || ch == "\t") { // Pre-process <space>
+        state.label = false;
+        if (state.commandMode == 0)
+          state.commandMode = 1;
+        else if ((state.commandMode < 0) || (state.commandMode == 2))
+          state.commandMode = 0;
+      } else if ((ch != ".") && (state.commandMode > 0)) {
+        if (ch == ":")
+          state.commandMode = -1;   // SIS - Command post-conditional
+        else
+          state.commandMode = 2;
+      }
+
+      // Do not color parameter list as line tag
+      if ((ch === "(") || (ch === "\u0009"))
+        state.label = false;
+
+      // MUMPS comment starts with ";"
+      if (ch === ";") {
+        stream.skipToEnd();
+        return "comment";
+      }
+
+      // Number Literals // SIS/RLM - MUMPS permits canonic number followed by concatenate operator
+      if (stream.match(/^[-+]?\d+(\.\d+)?([eE][-+]?\d+)?/))
+        return "number";
+
+      // Handle Strings
+      if (ch == '"') {
+        if (stream.skipTo('"')) {
+          stream.next();
+          return "string";
+        } else {
+          stream.skipToEnd();
+          return "error";
         }
+      }
 
+      // Handle operators and Delimiters
+      if (stream.match(doubleOperators) || stream.match(singleOperators))
+        return "operator";
 
-        if (stream.match(brakets)) {
-            return "bracket";
-        }
+      // Prevents leading "." in DO block from falling through to error
+      if (stream.match(singleDelimiters))
+        return null;
 
-        if (stream.match(command) && (commandMode > 0)) {
-            if (! state.doInCurrentLine)
-              indent(stream,state);
-            else
-              state.doInCurrentLine = false;
- 	    return 'header';    // SIS - Another empirical color choice - best blue for command
-        }
+      if (brackets.test(ch)) {
+        stream.next();
+        return "bracket";
+      }
 
-        if (stream.match(intrinsicFuncs)) {
-	    return 'keyword'; // SIS - See note above
-        }
+      if (state.commandMode > 0 && stream.match(command))
+        return "variable-2";
 
-        if (stream.match(identifiers)) {
-            return 'variable';
-        }
+      if (stream.match(intrinsicFuncs))
+        return "builtin";
 
-	// SIS - Detect dollar-sign when not a documented intrinsic function
-        if (ch === "$") {  // Start of extrinsic function
-	    stream.next();
-            return 'keyword';
-        }
+      if (stream.match(identifiers))
+        return "variable";
 
-	// SIS - '^' may introduce a GVN or SSVN - Color same as function
-        if (ch === "^") {
-	    stream.next();
-            return 'keyword';
-        }
+      // Detect dollar-sign when not a documented intrinsic function
+      // "^" may introduce a GVN or SSVN - Color same as function
+      if (ch === "$" || ch === "^") {
+        stream.next();
+        return "builtin";
+      }
 
-	// SIS - MUMPS Indirection
-        if (ch === "@") {
-	    stream.next();
-            return 'string-2'; // SIS - Same idea... Want orange for indirection
-        }
+      // MUMPS Indirection
+      if (ch === "@") {
+        stream.next();
+        return "string-2";
+      }
 
-	if (singletons.indexOf(ch) != -1) {  //SIS - Don't understand why kludge is needed
- 	    //stream.next();
-            return 'variable';
-	}
+      if (/[\w%]/.test(ch)) {
+        stream.eatWhile(/[\w%]/);
+        return "variable";
+      }
 
-        // Handle non-detected items
-        stream.next();
-        return ERRORCLASS;
+      // Handle non-detected items
+      stream.next();
+      return "error";
     }
 
-    function tokenStringFactory(delimiter) {
-        var singleline = delimiter.length == 1;
-        var OUTCLASS = 'string';
-
-        return function(stream, state) {
-            while (!stream.eol()) {
-                stream.eatWhile(/[^'"]/);
-                if (stream.match(delimiter)) {
-                    state.tokenize = tokenBase;
-                    return OUTCLASS;
-                } else {
-                    stream.eat(/['"]/);
-                }
-            }
-            if (singleline) {
-                if (parserConf.singleLineStringErrors) {
-                    return ERRORCLASS;
-                } else {
-                    state.tokenize = tokenBase;
-                }
-            }
-            return OUTCLASS;
+    return {
+      startState: function() {
+        return {
+          label: false,
+          commandMode: 0
         };
-    }
+      },
 
-    //SIS - MUMPS does not have '.' delimited identifiers
-    function tokenLexer(stream, state) {
-        var style = state.tokenize(stream, state);
-	// SIS - code removed here
+      token: function(stream, state) {
+        var style = tokenBase(stream, state);
+        if (state.label) return "tag";
         return style;
-    }
-
-    var external = {
-        //electricChars:"dDpPtTfFeE ",	//SIS - Only auto-indent on period
-	electricChars:".",		//SIS - Disregard - Smart indent is OFF
-        startState: function() {
-            return {
-              tokenize: tokenBase,
-              lastToken: null,
-              currentIndent: 0,
-              nextLineIndent: 0,
-              doInCurrentLine: false,
-              ignoreKeyword: false
-
-
-          };
-        },
-
-        token: function(stream, state) {
-            if (stream.sol()) {
-              state.currentIndent += state.nextLineIndent;
-              state.nextLineIndent = 0;
-              state.doInCurrentLine = 0;
-            }
-            var style = tokenLexer(stream, state);
-
-            state.lastToken = {style:style, content: stream.current()};
-
-            if (style==='space') style=null;
-
-	    if (label) return 'invalidchar'; // SIS - Line tags should default to red
-					     //       They are not invalid, of course
-            return style;
-        },
-
-        indent: function(state, textAfter) {
-            var trueText = textAfter.replace(/^\s+|\s+$/g, '') ;
-            if (trueText.match(closing) || trueText.match(middle)) return conf.indentUnit*(state.currentIndent-1);
-            if(state.currentIndent < 0) return 0;
-            return state.currentIndent * conf.indentUnit;
-        }
-
+      }
     };
-    return external;
-});
-
-CodeMirror.defineMIME("text/mumps", "mumps");	 // SIS - Don't know what this does.
+  });
 
+  CodeMirror.defineMIME("text/x-mumps", "mumps");
 });

From a1cbbd72224bdc5c8c5059f313d0138d009d8e4b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 1 Apr 2015 10:25:39 +0200
Subject: [PATCH 24/72] [sublime keymap] Fix backspacing across the start of a
 line

Closes #3170
---
 keymap/sublime.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keymap/sublime.js b/keymap/sublime.js
index cf18573605..441456f58c 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -416,7 +416,7 @@
     var toStartOfLine = cm.getRange({line: cursor.line, ch: 0}, cursor);
     var column = CodeMirror.countColumn(toStartOfLine, null, cm.getOption("tabSize"));
 
-    if (!/\S/.test(toStartOfLine) && column % cm.getOption("indentUnit") == 0)
+    if (toStartOfLine && !/\S/.test(toStartOfLine) && column % cm.getOption("indentUnit") == 0)
       return cm.indentSelection("subtract");
     else
       return CodeMirror.Pass;

From 06c9038336eda0362f59e30926c4ba405d4ffe66 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 1 Apr 2015 13:50:55 +0200
Subject: [PATCH 25/72] Add Armenian ech yiwn to nonASCIISingleCaseWordChar
 regexp

Closes #3168
---
 lib/codemirror.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 62d07c37ab..79774e3618 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8158,7 +8158,7 @@
     return function(){return f.apply(null, args);};
   }
 
-  var nonASCIISingleCaseWordChar = /[\u00df\u0590-\u05f4\u0600-\u06ff\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc\uac00-\ud7af]/;
+  var nonASCIISingleCaseWordChar = /[\u00df\u0587\u0590-\u05f4\u0600-\u06ff\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc\uac00-\ud7af]/;
   var isWordCharBasic = CodeMirror.isWordChar = function(ch) {
     return /\w/.test(ch) || ch > "\x80" &&
       (ch.toUpperCase() != ch.toLowerCase() || nonASCIISingleCaseWordChar.test(ch));

From 41b8b964bed9938caf1d3749f18da7819d75fb86 Mon Sep 17 00:00:00 2001
From: Marcel Gerber <mg.hain@gmx.de>
Date: Wed, 1 Apr 2015 11:06:38 +0200
Subject: [PATCH 26/72] Change "language modes" link to "over 100 languages"

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 163eeef3cb..a8680cd904 100644
--- a/index.html
+++ b/index.html
@@ -119,7 +119,7 @@
 <section id=features>
   <h2>Features</h2>
   <ul>
-    <li>Support for <a href="mode/index.html">over 90 languages</a> out of the box
+    <li>Support for <a href="mode/index.html">over 100 languages</a> out of the box
     <li>A powerful, <a href="mode/htmlmixed/index.html">composable</a> language mode <a href="doc/manual.html#modeapi">system</a>
     <li><a href="doc/manual.html#addon_show-hint">Autocompletion</a> (<a href="demo/xmlcomplete.html">XML</a>)
     <li><a href="doc/manual.html#addon_foldcode">Code folding</a>

From 9af92d9b5782963743895575b3d94d7a0ad48172 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 1 Apr 2015 15:32:48 +0200
Subject: [PATCH 27/72] Add lineWiseCopyCut option

Closes #3169
---
 doc/manual.html   | 5 +++++
 lib/codemirror.js | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/doc/manual.html b/doc/manual.html
index 955a89511d..d513b8ce18 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -354,6 +354,11 @@ <h3 id=modloader>Module loaders</h3>
       <dd>Whether the cursor should be drawn when a selection is
       active. Defaults to false.</dd>
 
+      <dt id="option_lineWiseCopyCut"><code><strong>lineWiseCopyCut</strong>: boolean</code></dt>
+      <dd>When enabled, which is the default, doing copy or cut when
+      there is no selection will copy or cut the whole lines that have
+      cursors on them.</dd>
+
       <dt id="option_undoDepth"><code><strong>undoDepth</strong>: integer</code></dt>
       <dd>The maximum number of undo levels that the editor stores.
       Note that this includes selection change events. Defaults to
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 79774e3618..24a70ff359 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1231,6 +1231,8 @@
             te.value = lastCopied.join("\n");
             selectInput(te);
           }
+        } else if (!cm.options.lineWiseCopyCut) {
+          return;
         } else {
           var ranges = copyableRanges(cm);
           lastCopied = ranges.text;
@@ -1562,6 +1564,8 @@
         if (cm.somethingSelected()) {
           lastCopied = cm.getSelections();
           if (e.type == "cut") cm.replaceSelection("", null, "cut");
+        } else if (!cm.options.lineWiseCopyCut) {
+          return;
         } else {
           var ranges = copyableRanges(cm);
           lastCopied = ranges.text;
@@ -5280,6 +5284,7 @@
   option("showCursorWhenSelecting", false, updateSelection, true);
 
   option("resetSelectionOnContextMenu", true);
+  option("lineWiseCopyCut", true);
 
   option("readOnly", false, function(cm, val) {
     if (val == "nocursor") {

From 4fb97fee8745bfc4a78daaead320839b8cd8c392 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 2 Apr 2015 21:45:55 +0200
Subject: [PATCH 28/72] [matchesonscrollbar addon] Support a maxMatches option

---
 addon/search/matchesonscrollbar.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addon/search/matchesonscrollbar.js b/addon/search/matchesonscrollbar.js
index dbd67a4a5d..8d19228971 100644
--- a/addon/search/matchesonscrollbar.js
+++ b/addon/search/matchesonscrollbar.js
@@ -19,6 +19,7 @@
 
   function SearchAnnotation(cm, query, caseFold, options) {
     this.cm = cm;
+    this.options = options;
     var annotateOptions = {listenForChanges: false};
     for (var prop in options) annotateOptions[prop] = options[prop];
     if (!annotateOptions.className) annotateOptions.className = "CodeMirror-search-match";
@@ -46,11 +47,12 @@
       if (match.to.line >= this.gap.from) this.matches.splice(i--, 1);
     }
     var cursor = this.cm.getSearchCursor(this.query, CodeMirror.Pos(this.gap.from, 0), this.caseFold);
+    var maxMatches = this.options && this.options.maxMatches || MAX_MATCHES;
     while (cursor.findNext()) {
       var match = {from: cursor.from(), to: cursor.to()};
       if (match.from.line >= this.gap.to) break;
       this.matches.splice(i++, 0, match);
-      if (this.matches.length > MAX_MATCHES) break;
+      if (this.matches.length > maxMatches) break;
     }
     this.gap = null;
   };

From 05cef7bfa9546a57d835303584d0bd474d764c94 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 2 Apr 2015 21:49:46 +0200
Subject: [PATCH 29/72] Make sure refocusing at end of operation doesn't steal
 focus

... from an element focused by an event handler.

Fixes the dialog addon.
---
 lib/codemirror.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 24a70ff359..758e9ea37b 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3041,7 +3041,7 @@
 
     if (cm.state.focused && op.updateInput)
       cm.display.input.reset(op.typing);
-    if (op.focus) ensureFocus(op.cm);
+    if (op.focus && op.focus == activeElt()) ensureFocus(op.cm);
   }
 
   function endOperation_finish(op) {
@@ -3521,7 +3521,7 @@
   var lastClick, lastDoubleClick;
   function leftButtonDown(cm, e, start) {
     if (ie) setTimeout(bind(ensureFocus, cm), 0);
-    else cm.curOp.focus = true;
+    else cm.curOp.focus = activeElt();
 
     var now = +new Date, type;
     if (lastDoubleClick && lastDoubleClick.time > now - 400 && cmp(lastDoubleClick.pos, start) == 0) {
@@ -3681,7 +3681,7 @@
       var cur = posFromMouse(cm, e, true, type == "rect");
       if (!cur) return;
       if (cmp(cur, lastPos) != 0) {
-        cm.curOp.focus = true;
+        cm.curOp.focus = activeElt();
         extendTo(cur);
         var visible = visibleLines(display, doc);
         if (cur.line >= visible.to || cur.line < visible.from)
@@ -4039,7 +4039,7 @@
   var lastStoppedKey = null;
   function onKeyDown(e) {
     var cm = this;
-    cm.curOp.focus = true;
+    cm.curOp.focus = activeElt();
     if (signalDOMEvent(cm, e)) return;
     // IE does strange things with escape.
     if (ie && ie_version < 11 && e.keyCode == 27) e.returnValue = false;

From 985c3e686295385d45732e6d03127eff6ca6c77e Mon Sep 17 00:00:00 2001
From: Michael Grey <liquibyte@gmail.com>
Date: Sun, 5 Apr 2015 12:29:51 +0200
Subject: [PATCH 30/72] [liquibyte theme] Add

---
 demo/theme.html     |  2 ++
 theme/liquibyte.css | 95 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 97 insertions(+)
 create mode 100644 theme/liquibyte.css

diff --git a/demo/theme.html b/demo/theme.html
index 22b59b7fdc..b3e31b5629 100644
--- a/demo/theme.html
+++ b/demo/theme.html
@@ -17,6 +17,7 @@
 <link rel="stylesheet" href="../theme/elegant.css">
 <link rel="stylesheet" href="../theme/erlang-dark.css">
 <link rel="stylesheet" href="../theme/lesser-dark.css">
+<link rel="stylesheet" href="../theme/liquibyte.css">
 <link rel="stylesheet" href="../theme/mbo.css">
 <link rel="stylesheet" href="../theme/mdn-like.css">
 <link rel="stylesheet" href="../theme/midnight.css">
@@ -87,6 +88,7 @@
     <option>elegant</option>
     <option>erlang-dark</option>
     <option>lesser-dark</option>
+    <option>liquibyte</option>
     <option>mbo</option>
     <option>mdn-like</option>
     <option>midnight</option>
diff --git a/theme/liquibyte.css b/theme/liquibyte.css
new file mode 100644
index 0000000000..a6e070c6a8
--- /dev/null
+++ b/theme/liquibyte.css
@@ -0,0 +1,95 @@
+.cm-s-liquibyte.CodeMirror {
+	background-color: #000;
+	color: #fff;
+	line-height: 1.2em;
+	font-size: 1em;
+}
+.CodeMirror-focused .cm-matchhighlight {
+	text-decoration: underline;
+	text-decoration-color: #0f0;
+	text-decoration-style: wavy;
+}
+.cm-trailingspace {
+	text-decoration: line-through;
+	text-decoration-color: #f00;
+	text-decoration-style: dotted;
+}
+.cm-tab {
+	text-decoration: line-through;
+	text-decoration-color: #404040;
+	text-decoration-style: dotted;
+}
+.cm-s-liquibyte .CodeMirror-gutters { background-color: #262626; border-right: 1px solid #505050; padding-right: 0.8em; }
+.cm-s-liquibyte .CodeMirror-gutter-elt div{ font-size: 1.2em; }
+.cm-s-liquibyte .CodeMirror-guttermarker {  }
+.cm-s-liquibyte .CodeMirror-guttermarker-subtle {  }
+.cm-s-liquibyte .CodeMirror-linenumber { color: #606060; padding-left: 0;}
+.cm-s-liquibyte .CodeMirror-cursor { border-left: 1px solid #eee !important; }
+
+.cm-s-liquibyte span.cm-comment     { color: #008000; }
+.cm-s-liquibyte span.cm-def         { color: #ffaf40; font-weight: bold; }
+.cm-s-liquibyte span.cm-keyword     { color: #c080ff; font-weight: bold; }
+.cm-s-liquibyte span.cm-builtin     { color: #ffaf40; font-weight: bold; }
+.cm-s-liquibyte span.cm-variable    { color: #5967ff; font-weight: bold; }
+.cm-s-liquibyte span.cm-string      { color: #ff8000; }
+.cm-s-liquibyte span.cm-number      { color: #0f0; font-weight: bold; }
+.cm-s-liquibyte span.cm-atom        { color: #bf3030; font-weight: bold; }
+
+.cm-s-liquibyte span.cm-variable-2  { color: #007f7f; font-weight: bold; }
+.cm-s-liquibyte span.cm-variable-3  { color: #c080ff; font-weight: bold; }
+.cm-s-liquibyte span.cm-property    { color: #999; font-weight: bold; }
+.cm-s-liquibyte span.cm-operator    { color: #fff; }
+
+.cm-s-liquibyte span.cm-meta        { color: #0f0; }
+.cm-s-liquibyte span.cm-qualifier   { color: #fff700; font-weight: bold; }
+.cm-s-liquibyte span.cm-bracket     { color: #cc7; }
+.cm-s-liquibyte span.cm-tag         { color: #ff0; font-weight: bold; }
+.cm-s-liquibyte span.cm-attribute   { color: #c080ff; font-weight: bold; }
+.cm-s-liquibyte span.cm-error       { color: #f00; }
+
+.cm-s-liquibyte .CodeMirror-selected { background-color: rgba(255, 0, 0, 0.25) !important; }
+
+.cm-s-liquibyte span.cm-compilation { background-color: rgba(255, 255, 255, 0.12); }
+
+.cm-s-liquibyte .CodeMirror-activeline-background {background-color: rgba(0, 255, 0, 0.15) !important;}
+
+/* Default styles for common addons */
+div.CodeMirror span.CodeMirror-matchingbracket { color: #0f0; font-weight: bold; }
+div.CodeMirror span.CodeMirror-nonmatchingbracket { color: #f00; font-weight: bold; }
+.CodeMirror-matchingtag { background-color: rgba(150, 255, 0, .3); }
+/* Scrollbars */
+/* Simple */
+div.CodeMirror-simplescroll-horizontal div:hover, div.CodeMirror-simplescroll-vertical div:hover {
+	background-color: rgba(80, 80, 80, .7);
+}
+div.CodeMirror-simplescroll-horizontal div, div.CodeMirror-simplescroll-vertical div {
+	background-color: rgba(80, 80, 80, .3);
+	border: 1px solid #404040;
+	border-radius: 5px;
+}
+div.CodeMirror-simplescroll-vertical div {
+	border-top: 1px solid #404040;
+	border-bottom: 1px solid #404040;
+}
+div.CodeMirror-simplescroll-horizontal div {
+	border-left: 1px solid #404040;
+	border-right: 1px solid #404040;
+}
+div.CodeMirror-simplescroll-vertical {
+	background-color: #262626;
+}
+div.CodeMirror-simplescroll-horizontal {
+	background-color: #262626;
+	border-top: 1px solid #404040;
+}
+/* Overlay */
+div.CodeMirror-overlayscroll-horizontal div, div.CodeMirror-overlayscroll-vertical div {
+	background-color: #404040;
+	border-radius: 5px;
+}
+div.CodeMirror-overlayscroll-vertical div {
+	border: 1px solid #404040;
+}
+div.CodeMirror-overlayscroll-horizontal div {
+	border: 1px solid #404040;
+}

From 5f49b40a8b77dc6507381dea174aa91c9b3c1fc0 Mon Sep 17 00:00:00 2001
From: Ivoah <ivoahivoah@gmail.com>
Date: Thu, 2 Apr 2015 08:58:13 -0400
Subject: [PATCH 31/72] [real-world uses] Add SourceCoder 3

---
 doc/realworld.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/realworld.html b/doc/realworld.html
index 7a326cf238..4ea368e7d2 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -138,6 +138,7 @@
       <li><a href="http://snaptomato.appspot.com/editor.html">Snap Tomato</a> (HTML editing/testing page)</li>
       <li><a href="http://snippets.pro/">Snippets.pro</a> (code snippet sharing)</li>
       <li><a href="http://www.solidshops.com/">SolidShops</a> (hosted e-commerce platform)</li>
+      <li><a href="http://www.cemetech.net/sc/">SourceCoder 3</a> (online calculator IDE and editor)</li>
       <li><a href="http://sqlfiddle.com">SQLFiddle</a> (SQL playground)</li>
       <li><a href="http://www.subte.org/page/programar-ta-te-ti-online/">SubTe</a> (AI bot programming environment)</li>
       <li><a href="http://xuanji.appspot.com/isicp/">Structure and Interpretation of Computer Programs</a>, Interactive Version</li>

From cec8ddd342fc267588d71d16fa78a7bf6e3e7397 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 5 Apr 2015 12:50:02 +0200
Subject: [PATCH 32/72] [soy mode] Include question mark as identifier char

Closes #3177
---
 mode/soy/soy.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index 7e81e8dd56..79bfc24dfd 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -96,7 +96,7 @@
               else state.indent -= (stream.current() == "/}" || indentingTags.indexOf(state.tag) == -1 ? 2 : 1) * config.indentUnit;
               state.soyState.pop();
               return "keyword";
-            } else if (stream.match(/^(\w+)(?==)/)) {
+            } else if (stream.match(/^([\w?]+)(?==)/)) {
               if (stream.current() == "kind" && (match = stream.match(/^="([^"]+)/, false))) {
                 var kind = match[1];
                 state.kind.push(kind);
@@ -134,7 +134,7 @@
           return "comment";
         } else if (stream.match(stream.sol() ? /^\s*\/\/.*/ : /^\s+\/\/.*/)) {
           return "comment";
-        } else if (stream.match(/^\{\$\w*/)) {
+        } else if (stream.match(/^\{\$[\w?]*/)) {
           state.indent += 2 * config.indentUnit;
           state.soyState.push("variable");
           return "variable-2";
@@ -142,7 +142,7 @@
           state.indent += config.indentUnit;
           state.soyState.push("literal");
           return "keyword";
-        } else if (match = stream.match(/^\{([\/@\\]?\w*)/)) {
+        } else if (match = stream.match(/^\{([\/@\\]?[\w?]*)/)) {
           if (match[1] != "/switch")
             state.indent += (/^(\/|(else|elseif|case|default)$)/.test(match[1]) && state.tag != "switch" ? 1 : 2) * config.indentUnit;
           state.tag = match[1];

From 62af9c62dd5a14665996a1ea83a3f675822b0ed2 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 5 Apr 2015 21:47:32 +0200
Subject: [PATCH 33/72] [continuelist addon] Don't continue horiziontal rules
 as lists

Closes #3178
---
 addon/edit/continuelist.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/addon/edit/continuelist.js b/addon/edit/continuelist.js
index ca8d26751a..0afc2d163a 100644
--- a/addon/edit/continuelist.js
+++ b/addon/edit/continuelist.js
@@ -13,29 +13,30 @@
 
   var listRE = /^(\s*)(>[> ]*|[*+-]\s|(\d+)\.)(\s*)/,
       emptyListRE = /^(\s*)(>[> ]*|[*+-]|(\d+)\.)(\s*)$/,
-      unorderedListRE = /[*+-]\s/;
+      unorderedListRE = /[*+-]\s/,
+      ruleRE = /^\s*((-\s*){3}|(\*\s*){3}(_\s*){3})$/;
 
   CodeMirror.commands.newlineAndIndentContinueMarkdownList = function(cm) {
     if (cm.getOption("disableInput")) return CodeMirror.Pass;
     var ranges = cm.listSelections(), replacements = [];
     for (var i = 0; i < ranges.length; i++) {
-      var pos = ranges[i].head, match;
+      var pos = ranges[i].head;
       var eolState = cm.getStateAfter(pos.line);
       var inList = eolState.list !== false;
       var inQuote = eolState.quote !== false;
 
-      if (!ranges[i].empty() || (!inList && !inQuote) || !(match = cm.getLine(pos.line).match(listRE))) {
+      var line = cm.getLine(pos.line), match = listRE.exec(line);
+      if (!ranges[i].empty() || (!inList && !inQuote) || !match || ruleRE.test(line)) {
         cm.execCommand("newlineAndIndent");
         return;
       }
-      if (cm.getLine(pos.line).match(emptyListRE)) {
+      if (emptyListRE.test(line)) {
         cm.replaceRange("", {
           line: pos.line, ch: 0
         }, {
           line: pos.line, ch: pos.ch + 1
         });
         replacements[i] = "\n";
-
       } else {
         var indent = match[1], after = match[4];
         var bullet = unorderedListRE.test(match[2]) || match[2].indexOf(">") >= 0

From 0bfd44a40248fe5d47268f1226ecc561eee74887 Mon Sep 17 00:00:00 2001
From: Marcel Gerber <mg.hain@gmx.de>
Date: Fri, 3 Apr 2015 20:08:03 +0200
Subject: [PATCH 34/72] [continuelist addon] Fix inQuote variable

---
 addon/edit/continuelist.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/addon/edit/continuelist.js b/addon/edit/continuelist.js
index 0afc2d163a..86de49c538 100644
--- a/addon/edit/continuelist.js
+++ b/addon/edit/continuelist.js
@@ -13,8 +13,7 @@
 
   var listRE = /^(\s*)(>[> ]*|[*+-]\s|(\d+)\.)(\s*)/,
       emptyListRE = /^(\s*)(>[> ]*|[*+-]|(\d+)\.)(\s*)$/,
-      unorderedListRE = /[*+-]\s/,
-      ruleRE = /^\s*((-\s*){3}|(\*\s*){3}(_\s*){3})$/;
+      unorderedListRE = /[*+-]\s/;
 
   CodeMirror.commands.newlineAndIndentContinueMarkdownList = function(cm) {
     if (cm.getOption("disableInput")) return CodeMirror.Pass;
@@ -23,10 +22,10 @@
       var pos = ranges[i].head;
       var eolState = cm.getStateAfter(pos.line);
       var inList = eolState.list !== false;
-      var inQuote = eolState.quote !== false;
+      var inQuote = eolState.quote !== 0;
 
       var line = cm.getLine(pos.line), match = listRE.exec(line);
-      if (!ranges[i].empty() || (!inList && !inQuote) || !match || ruleRE.test(line)) {
+      if (!ranges[i].empty() || (!inList && !inQuote) || !match) {
         cm.execCommand("newlineAndIndent");
         return;
       }

From 3ecb14b6f12083cc1695d6553fb7d5eee34c8032 Mon Sep 17 00:00:00 2001
From: Marcel Gerber <mg.hain@gmx.de>
Date: Fri, 3 Apr 2015 20:08:43 +0200
Subject: [PATCH 35/72] [markdown mode] Make use of prevLineIsList variable

---
 mode/markdown/markdown.js | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 3c80311068..a7d3d9ab3d 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -116,18 +116,20 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
     var sol = stream.sol();
 
-    var prevLineIsList = (state.list !== false);
-    if (state.list !== false && state.indentationDiff >= 0) { // Continued list
-      if (state.indentationDiff < 4) { // Only adjust indentation if *not* a code block
-        state.indentation -= state.indentationDiff;
+    var prevLineIsList = state.list !== false;
+    if (prevLineIsList) {
+      if (state.indentationDiff >= 0) { // Continued list
+        if (state.indentationDiff < 4) { // Only adjust indentation if *not* a code block
+          state.indentation -= state.indentationDiff;
+        }
+        state.list = null;
+      } else if (state.indentation > 0) {
+        state.list = null;
+        state.listDepth = Math.floor(state.indentation / 4);
+      } else { // No longer a list
+        state.list = false;
+        state.listDepth = 0;
       }
-      state.list = null;
-    } else if (state.list !== false && state.indentation > 0) {
-      state.list = null;
-      state.listDepth = Math.floor(state.indentation / 4);
-    } else if (state.list !== false) { // No longer a list
-      state.list = false;
-      state.listDepth = 0;
     }
 
     var match = null;

From fa9bc9902af4aa782571bf662fe19750b89a120f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 5 Apr 2015 22:08:59 +0200
Subject: [PATCH 36/72] [bower.json] Ignore more files

Closes #3179
---
 bower.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bower.json b/bower.json
index d49cf34d70..59f7380eab 100644
--- a/bower.json
+++ b/bower.json
@@ -11,6 +11,8 @@
     "doc",
     "test",
     "index.html",
-    "package.json"
+    "package.json",
+    "mode/*/*test.js",
+    "mode/*/*.html"
   ]
 }

From 1f3a19619054d37fc4d2432704ee7ebe3a26dda4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 5 Apr 2015 22:34:40 +0200
Subject: [PATCH 37/72] Allow a line handle to be passed to heightAtLine

---
 doc/manual.html   |  2 +-
 lib/codemirror.js | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index d513b8ce18..d7f80f32cd 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1811,7 +1811,7 @@ <h3 id="api_sizing">Sizing, scrolling and positioning methods</h3>
       height. <code>mode</code> can be one of the same strings
       that <a href="#coordsChar"><code>coordsChar</code></a>
       accepts.</dd>
-      <dt id="heightAtLine"><code><strong>cm.heightAtLine</strong>(line: number, ?mode: string) → number</code></dt>
+      <dt id="heightAtLine"><code><strong>cm.heightAtLine</strong>(line: integer|LineHandle, ?mode: string) → number</code></dt>
       <dd>Computes the height of the top of a line, in the coordinate
       system specified by <code>mode</code>
       (see <a href="#coordsChar"><code>coordsChar</code></a>), which
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 758e9ea37b..19bdbc7d98 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4929,10 +4929,15 @@
       return lineAtHeight(this.doc, height + this.display.viewOffset);
     },
     heightAtLine: function(line, mode) {
-      var end = false, last = this.doc.first + this.doc.size - 1;
-      if (line < this.doc.first) line = this.doc.first;
-      else if (line > last) { line = last; end = true; }
-      var lineObj = getLine(this.doc, line);
+      var end = false, lineObj;
+      if (typeof line == "number") {
+        var last = this.doc.first + this.doc.size - 1;
+        if (line < this.doc.first) line = this.doc.first;
+        else if (line > last) { line = last; end = true; }
+        lineObj = getLine(this.doc, line);
+      } else {
+        lineObj = line;
+      }
       return intoCoordSystem(this, lineObj, {top: 0, left: 0}, mode || "page").top +
         (end ? this.doc.height - heightAtLine(lineObj) : 0);
     },

From 9f556032e9c78c812ed4da1c5cf785a44a01e720 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 5 Apr 2015 22:34:44 +0200
Subject: [PATCH 38/72] [annotatescrollbar addon] Avoid calls to charCoords
 when possible

Issue #3173
---
 addon/scroll/annotatescrollbar.js | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/addon/scroll/annotatescrollbar.js b/addon/scroll/annotatescrollbar.js
index 54aeacf271..e62a45acf2 100644
--- a/addon/scroll/annotatescrollbar.js
+++ b/addon/scroll/annotatescrollbar.js
@@ -68,15 +68,30 @@
     var cm = this.cm, hScale = this.hScale;
 
     var frag = document.createDocumentFragment(), anns = this.annotations;
+
+    var wrapping = cm.getOption("lineWrapping");
+    var singleLineH = wrapping && cm.defaultTextHeight() * 1.5;
+    var curLine = null, curLineObj = null;
+    function getY(pos, top) {
+      if (curLine != pos.line) {
+        curLine = pos.line;
+        curLineObj = cm.getLineHandle(curLine);
+      }
+      if (wrapping && curLineObj.height > singleLineH)
+        return cm.charCoords(pos, "local")[top ? "top" : "bottom"];
+      var topY = cm.heightAtLine(curLineObj, "local");
+      return topY + (top ? 0 : curLineObj.height);
+    }
+
     if (cm.display.barWidth) for (var i = 0, nextTop; i < anns.length; i++) {
       var ann = anns[i];
-      var top = nextTop || cm.charCoords(ann.from, "local").top * hScale;
-      var bottom = cm.charCoords(ann.to, "local").bottom * hScale;
+      var top = nextTop || getY(ann.from, true) * hScale;
+      var bottom = getY(ann.to, false) * hScale;
       while (i < anns.length - 1) {
-        nextTop = cm.charCoords(anns[i + 1].from, "local").top * hScale;
+        nextTop = getY(anns[i + 1].from, true) * hScale;
         if (nextTop > bottom + .9) break;
         ann = anns[++i];
-        bottom = cm.charCoords(ann.to, "local").bottom * hScale;
+        bottom = getY(ann.to, false) * hScale;
       }
       if (bottom == top) continue;
       var height = Math.max(bottom - top, 3);

From a726389e8fff41e6db8e1460be56af11f121e4c3 Mon Sep 17 00:00:00 2001
From: Dmitry Kiselyov <dmitrykiselyov@ukr.net>
Date: Mon, 6 Apr 2015 20:48:00 +0300
Subject: [PATCH 39/72] [stylus mode] Fix indentation after a var with the $

For example:

v1 = $v2
  |new line

body
  color $c
    |new line
---
 mode/stylus/stylus.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/mode/stylus/stylus.js b/mode/stylus/stylus.js
index 60d9a737fb..fc46a0163d 100644
--- a/mode/stylus/stylus.js
+++ b/mode/stylus/stylus.js
@@ -323,7 +323,12 @@
         return pushContext(state, stream, "block", 0);
       }
       if (type == "variable-name") {
-        return pushContext(state, stream, "variableName");
+        if ((stream.indentation() == 0 && startOfLine(stream)) || wordIsBlock(firstWordOfLine(stream))) {
+          return pushContext(state, stream, "variableName");
+        }
+        else {
+          return pushContext(state, stream, "variableName", 0);
+        }
       }
       if (type == "=") {
         if (!endOfLine(stream) && !wordIsBlock(firstWordOfLine(stream))) {
@@ -445,10 +450,10 @@
              wordIsTag(firstWordOfLine(stream)))) {
           return pushContext(state, stream, "block");
         }
-        if (stream.string.match(/^-?[a-z][\w-\.\[\]\'\"]*\s*=/) ||
+        if (stream.string.match(/^[\$-]?[a-z][\w-\.\[\]\'\"]*\s*=/) ||
             stream.string.match(/^\s*(\(|\)|[0-9])/) ||
             stream.string.match(/^\s+[a-z][\w-]*\(/i) ||
-            stream.string.match(/^\s+-?[a-z]/i)) {
+            stream.string.match(/^\s+[\$-]?[a-z]/i)) {
           return pushContext(state, stream, "block", 0);
         }
         if (endOfLine(stream)) return pushContext(state, stream, "block");

From d9c9377faf4155bd3de9ca6eef0ffb681e1f2ff3 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Thu, 9 Apr 2015 18:54:14 +0400
Subject: [PATCH 40/72] [vim] fix ct command

---
 keymap/vim.js    |  5 +++--
 test/vim_test.js | 11 +++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index f5f8cafbc7..272ba02f8c 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1856,10 +1856,11 @@
           var anchor = ranges[0].anchor,
               head = ranges[0].head;
           text = cm.getRange(anchor, head);
-          if (!isWhiteSpaceString(text)) {
+          var lastState = vim.lastEditInputState || {};
+          if (lastState.motion == "moveByWords" && !isWhiteSpaceString(text)) {
             // Exclude trailing whitespace if the range is not all whitespace.
             var match = (/\s+$/).exec(text);
-            if (match) {
+            if (match && lastState.motionArgs && lastState.motionArgs.forward) {
               head = offsetCursor(head, 0, - match[0].length);
               text = text.slice(0, - match[0].length);
             }
diff --git a/test/vim_test.js b/test/vim_test.js
index dfce9a2ce5..69a7cb6f5c 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -984,6 +984,17 @@ testVim('cc_multiply_repeat', function(cm, vim, helpers) {
   is(register.linewise);
   eq('vim-insert', cm.getOption('keyMap'));
 });
+testVim('ct', function(cm, vim, helpers) {
+  cm.setCursor(0, 9);
+  helpers.doKeys('c', 't', 'w');
+  eq('  word1  word3', cm.getValue());
+  helpers.doKeys('<Esc>', 'c', '|');
+  eq(' word3', cm.getValue());
+  helpers.assertCursorAt(0, 0);
+  helpers.doKeys('<Esc>', '2', 'u', 'w', 'h');
+  helpers.doKeys('c', '2', 'g', 'e');
+  eq('  wordword3', cm.getValue());
+}, { value: '  word1  word2  word3'});
 testVim('cc_should_not_append_to_document', function(cm, vim, helpers) {
   var expectedLineCount = cm.lineCount();
   cm.setCursor(cm.lastLine(), 0);

From 9e3c5179b7048b486111f7a6057414de60dd05d0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 10 Apr 2015 10:29:42 +0200
Subject: [PATCH 41/72] Properly draw zero-length replaced markers

---
 lib/codemirror.js | 11 ++++++++---
 test/test.js      |  8 ++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 19bdbc7d98..c1a3bdef92 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -6942,8 +6942,13 @@
         var foundBookmarks = [];
         for (var j = 0; j < spans.length; ++j) {
           var sp = spans[j], m = sp.marker;
-          if (sp.from <= pos && (sp.to == null || sp.to > pos)) {
-            if (sp.to != null && nextChange > sp.to) { nextChange = sp.to; spanEndStyle = ""; }
+          if (m.type == "bookmark" && sp.from == pos && m.widgetNode) {
+            foundBookmarks.push(m);
+          } else if (sp.from <= pos && (sp.to == null || sp.to > pos || m.collapsed && sp.to == pos && sp.from == pos)) {
+            if (sp.to != null && sp.to != pos && nextChange > sp.to) {
+              nextChange = sp.to;
+              spanEndStyle = "";
+            }
             if (m.className) spanStyle += " " + m.className;
             if (m.css) css = m.css;
             if (m.startStyle && sp.from == pos) spanStartStyle += " " + m.startStyle;
@@ -6954,12 +6959,12 @@
           } else if (sp.from > pos && nextChange > sp.from) {
             nextChange = sp.from;
           }
-          if (m.type == "bookmark" && sp.from == pos && m.widgetNode) foundBookmarks.push(m);
         }
         if (collapsed && (collapsed.from || 0) == pos) {
           buildCollapsedSpan(builder, (collapsed.to == null ? len + 1 : collapsed.to) - pos,
                              collapsed.marker, collapsed.from == null);
           if (collapsed.to == null) return;
+          if (collapsed.to == pos) collapsed = false;
         }
         if (!collapsed && foundBookmarks.length) for (var j = 0; j < foundBookmarks.length; ++j)
           buildCollapsedSpan(builder, 0, foundBookmarks[j]);
diff --git a/test/test.js b/test/test.js
index 4631672bdb..5cb0a7ff0b 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1004,6 +1004,14 @@ testCM("wrappingInlineWidget", function(cm) {
   eq(curR.bottom, cur1.bottom);
 }, {value: "1 2 3 xxx 4", lineWrapping: true});
 
+testCM("showEmptyWidgetSpan", function(cm) {
+  var marker = cm.markText(Pos(0, 2), Pos(0, 2), {
+    clearWhenEmpty: false,
+    replacedWith: document.createTextNode("X")
+  });
+  eq(cm.display.view[0].text.textContent, "abXc");
+}, {value: "abc"});
+
 testCM("changedInlineWidget", function(cm) {
   cm.setSize("10em");
   var w = document.createElement("span");

From f516823b3ef6066981137f7544158b1b23d8423c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 10 Apr 2015 10:28:59 +0200
Subject: [PATCH 42/72] [textarea input] Directly handle IME events

---
 lib/codemirror.css |  2 ++
 lib/codemirror.js  | 19 ++++++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index e531d296e2..ceacd13047 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -126,6 +126,8 @@ div.CodeMirror-overwrite div.CodeMirror-cursor {}
 .cm-s-default .cm-error {color: #f00;}
 .cm-invalidchar {color: #f00;}
 
+.CodeMirror-composing { border-bottom: 2px solid; }
+
 /* Default styles for common addons */
 
 div.CodeMirror span.CodeMirror-matchingbracket {color: #0f0;}
diff --git a/lib/codemirror.js b/lib/codemirror.js
index c1a3bdef92..844c199bf1 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1259,6 +1259,23 @@
       on(display.lineSpace, "selectstart", function(e) {
         if (!eventInWidget(display, e)) e_preventDefault(e);
       });
+
+      on(te, "compositionstart", function(e) {
+        var widget = elt("span", e.data, "CodeMirror-composing");
+        input.composing = cm.markText(cm.getCursor("from"), cm.getCursor("to"), {
+          clearWhenEmpty: false,
+          replacedWith: widget
+        });
+      });
+      on(te, "compositionupdate", function(e) {
+        input.composing.replacedWith.textContent = e.data;
+        input.composing.changed();
+      });
+      on(te, "compositionend", function() {
+        input.composing.clear();
+        input.composing = null;
+        input.poll();
+      });
     },
 
     prepareSelection: function() {
@@ -1366,7 +1383,7 @@
       // possible when it is clear that nothing happened. hasSelection
       // will be the case when there is a lot of text in the textarea,
       // in which case reading its value would be expensive.
-      if (!cm.state.focused || (hasSelection(input) && !prevInput) ||
+      if (this.composing || !cm.state.focused || (hasSelection(input) && !prevInput) ||
           isReadOnly(cm) || cm.options.disableInput || cm.state.keySeq)
         return false;
       // See paste handler for more on the fakedLastChar kludge

From 40b5625bb17980bebbdf37a1a8a9db9dc34eaabc Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 10 Apr 2015 11:03:17 +0200
Subject: [PATCH 43/72] [textarea input] Different approach to IME input

---
 lib/codemirror.js | 40 +++++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 844c199bf1..fc6e3abfb7 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1079,7 +1079,7 @@
   // was made out of.
   var lastCopied = null;
 
-  function applyTextInput(cm, inserted, deleted, sel) {
+  function applyTextInput(cm, inserted, deleted, sel, origin) {
     var doc = cm.doc;
     cm.display.shift = false;
     if (!sel) sel = doc.sel;
@@ -1105,7 +1105,7 @@
       }
       var updateInput = cm.curOp.updateInput;
       var changeEvent = {from: from, to: to, text: multiPaste ? multiPaste[i % multiPaste.length] : textLines,
-                         origin: cm.state.pasteIncoming ? "paste" : cm.state.cutIncoming ? "cut" : "+input"};
+                         origin: origin || (cm.state.pasteIncoming ? "paste" : cm.state.cutIncoming ? "cut" : "+input")};
       makeChange(cm.doc, changeEvent);
       signalLater(cm, "inputRead", cm, changeEvent);
       // When an 'electric' character is inserted, immediately trigger a reindent
@@ -1167,6 +1167,7 @@
     this.inaccurateSelection = false;
     // Used to work around IE issue with selection being forgotten when focus moves away from textarea
     this.hasSelection = false;
+    this.composing = null;
   };
 
   function hiddenTextarea() {
@@ -1260,21 +1261,19 @@
         if (!eventInWidget(display, e)) e_preventDefault(e);
       });
 
-      on(te, "compositionstart", function(e) {
-        var widget = elt("span", e.data, "CodeMirror-composing");
-        input.composing = cm.markText(cm.getCursor("from"), cm.getCursor("to"), {
-          clearWhenEmpty: false,
-          replacedWith: widget
-        });
-      });
-      on(te, "compositionupdate", function(e) {
-        input.composing.replacedWith.textContent = e.data;
-        input.composing.changed();
+      on(te, "compositionstart", function() {
+        var start = cm.getCursor("from");
+        input.composing = {
+          start: start,
+          range: cm.markText(start, cm.getCursor("to"), {className: "CodeMirror-composing"})
+        };
       });
       on(te, "compositionend", function() {
-        input.composing.clear();
-        input.composing = null;
-        input.poll();
+        if (input.composing) {
+          input.poll();
+          input.composing.range.clear();
+          input.composing = null;
+        }
       });
     },
 
@@ -1383,7 +1382,7 @@
       // possible when it is clear that nothing happened. hasSelection
       // will be the case when there is a lot of text in the textarea,
       // in which case reading its value would be expensive.
-      if (this.composing || !cm.state.focused || (hasSelection(input) && !prevInput) ||
+      if (!cm.state.focused || (hasSelection(input) && !prevInput) ||
           isReadOnly(cm) || cm.options.disableInput || cm.state.keySeq)
         return false;
       // See paste handler for more on the fakedLastChar kludge
@@ -1414,11 +1413,18 @@
 
       var self = this;
       runInOp(cm, function() {
-        applyTextInput(cm, text.slice(same), prevInput.length - same);
+        applyTextInput(cm, text.slice(same), prevInput.length - same,
+                       null, self.composing ? "*compose" : null);
 
         // Don't leave long text in the textarea, since it makes further polling slow
         if (text.length > 1000 || text.indexOf("\n") > -1) input.value = self.prevInput = "";
         else self.prevInput = text;
+
+        if (self.composing) {
+          self.composing.range.clear();
+          self.composing.range = cm.markText(self.composing.start, cm.getCursor("to"),
+                                             {className: "CodeMirror-composing"});
+        }
       });
       return true;
     },

From 34d8dc43ebab5c2e359425bfd69f063cc359c6c3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 10 Apr 2015 11:37:07 +0200
Subject: [PATCH 44/72] [smarty mode] Prevent outer mode from getting confused
 by Smarty tags

Issue #3186
---
 mode/smarty/smarty.js | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/mode/smarty/smarty.js b/mode/smarty/smarty.js
index 7eada8223e..6e0fbed422 100644
--- a/mode/smarty/smarty.js
+++ b/mode/smarty/smarty.js
@@ -47,10 +47,17 @@
     }
 
     function tokenTop(stream, state) {
-      if (stream.match(leftDelimiter, true)) {
+      var string = stream.string;
+      for (var scan = stream.pos;;) {
+        var nextMatch = string.indexOf(leftDelimiter, scan);
+        scan = nextMatch + leftDelimiter.length;
+        if (nextMatch == -1 || !doesNotCount(stream, nextMatch + leftDelimiter.length)) break;
+      }
+      if (nextMatch == stream.pos) {
+        stream.match(leftDelimiter);
         if (stream.eat("*")) {
           return chain(stream, state, tokenBlock("comment", "*" + rightDelimiter));
-        } else if (!doesNotCount(stream)) {
+        } else {
           state.depth++;
           state.tokenize = tokenSmarty;
           last = "startTag";
@@ -58,11 +65,9 @@
         }
       }
 
+      if (nextMatch > -1) stream.string = string.slice(0, nextMatch);
       var token = baseMode.token(stream, state.base);
-      var text = stream.current();
-      var found = text.indexOf(leftDelimiter);
-      if (found > -1 && !doesNotCount(stream, stream.start + found + 1))
-        stream.backUp(text.length - found);
+      if (nextMatch > -1) stream.string = string;
       return token;
     }
 
@@ -205,6 +210,12 @@
         state.last = last;
         return style;
       },
+      indent: function(state, text) {
+        if (state.tokenize == tokenTop && baseMode.indent)
+          return baseMode.indent(state.base, text);
+        else
+          return CodeMirror.Pass;
+      },
       blockCommentStart: leftDelimiter + "*",
       blockCommentEnd: "*" + rightDelimiter
     };

From f6e516f3876dd2b74d3fac516ef1a6fdb647a457 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 10 Apr 2015 11:48:18 +0200
Subject: [PATCH 45/72] Add electricInput event

Closes #3188
---
 doc/manual.html   | 5 +++++
 lib/codemirror.js | 9 ++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index d7f80f32cd..63b22bf693 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -549,6 +549,11 @@ <h3 id=modloader>Module loaders</h3>
       <dd>Fired whenever new input is read from the hidden textarea
       (typed or pasted by the user).</dd>
 
+      <dt id="event_electricInput"><code><strong>"electrictInput"</strong> (instance: CodeMirror, line: integer)</code></dt>
+      <dd>Fired if text input matched the
+      mode's <a href="#option_electricChars">electric</a> patterns,
+      and this caused the line's indentation to change.</dd>
+
       <dt id="event_beforeSelectionChange"><code><strong>"beforeSelectionChange"</strong> (instance: CodeMirror, obj: {ranges, update})</code></dt>
       <dd>This event is fired before the selection is moved. Its
       handler may inspect the set of selection ranges, present as an
diff --git a/lib/codemirror.js b/lib/codemirror.js
index fc6e3abfb7..f5b1b8c904 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1114,16 +1114,18 @@
           (!i || sel.ranges[i - 1].head.line != range.head.line)) {
         var mode = cm.getModeAt(range.head);
         var end = changeEnd(changeEvent);
+        var indented = false;
         if (mode.electricChars) {
           for (var j = 0; j < mode.electricChars.length; j++)
             if (inserted.indexOf(mode.electricChars.charAt(j)) > -1) {
-              indentLine(cm, end.line, "smart");
+              indented = indentLine(cm, end.line, "smart");
               break;
             }
         } else if (mode.electricInput) {
           if (mode.electricInput.test(getLine(doc, end.line).text.slice(0, end.ch)))
-            indentLine(cm, end.line, "smart");
+            indented = indentLine(cm, end.line, "smart");
         }
+        if (indented) signalLater(cm, "electricInput", cm, end.line);
       }
     }
     ensureCursorVisible(cm);
@@ -4650,6 +4652,8 @@
 
     if (indentString != curSpaceString) {
       replaceRange(doc, indentString, Pos(n, 0), Pos(n, curSpaceString.length), "+input");
+      line.stateAfter = null;
+      return true;
     } else {
       // Ensure that, if the cursor was in the whitespace at the start
       // of the line, it is moved to the end of that space.
@@ -4662,7 +4666,6 @@
         }
       }
     }
-    line.stateAfter = null;
   }
 
   // Utility for applying a change to a line by handle or number,

From 0a83a4ba43fd1191a48fec1507c3db6d18570de6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 10 Apr 2015 12:19:17 +0200
Subject: [PATCH 46/72] [show-hint addon] Fix more race conditions

Clean up duplicated logic

Issue #3189
---
 addon/hint/show-hint.js | 125 +++++++++++++++++++++---------------------------
 1 file changed, 55 insertions(+), 70 deletions(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 35686df35b..539181fdb7 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -24,44 +24,44 @@
     return cm.showHint(newOpts);
   };
 
-  var asyncRunID = 0;
-  function retrieveHints(getter, cm, options, then) {
-    if (getter.async) {
-      var id = ++asyncRunID;
-      getter(cm, function(hints) {
-        if (asyncRunID == id) then(hints);
-      }, options);
-    } else {
-      then(getter(cm, options));
-    }
-  }
-
   CodeMirror.defineExtension("showHint", function(options) {
     // We want a single cursor position.
     if (this.listSelections().length > 1 || this.somethingSelected()) return;
 
     if (this.state.completionActive) this.state.completionActive.close();
     var completion = this.state.completionActive = new Completion(this, options);
-    var getHints = completion.options.hint;
-    if (!getHints) return;
+    if (!completion.options.hint) return;
 
     CodeMirror.signal(this, "startCompletion", this);
-    return retrieveHints(getHints, this, completion.options, function(hints) { completion.showHints(hints); });
+    completion.update();
   });
 
   function Completion(cm, options) {
     this.cm = cm;
     this.options = this.buildOptions(options);
-    this.widget = this.onClose = null;
+    this.widget = null;
+    this.debounce = 0;
+    this.tick = 0;
+    this.startPos = this.cm.getCursor();
+    this.startLen = this.cm.getLine(this.startPos.line).length;
+
+    var self = this;
+    cm.on("cursorActivity", this.activityFunc = function() { self.cursorActivity(); });
   }
 
+  var requestAnimationFrame = window.requestAnimationFrame || function(fn) {
+    return setTimeout(fn, 1000/60);
+  };
+  var cancelAnimationFrame = window.cancelAnimationFrame || clearTimeout;
+
   Completion.prototype = {
     close: function() {
       if (!this.active()) return;
       this.cm.state.completionActive = null;
+      this.tick = null;
+      this.cm.off("cursorActivity", this.activityFunc);
 
       if (this.widget) this.widget.close();
-      if (this.onClose) this.onClose();
       CodeMirror.signal(this.cm, "endCompletion", this.cm);
     },
 
@@ -87,66 +87,51 @@
         this.showWidget(data);
     },
 
-    showWidget: function(data) {
-      this.widget = new Widget(this, data);
-      CodeMirror.signal(data, "shown");
-
-      var debounce = 0, completion = this, tick = 0;
-      var closeOn = this.options.closeCharacters;
-      var startPos = this.cm.getCursor(), startLen = this.cm.getLine(startPos.line).length;
-
-      var requestAnimationFrame = window.requestAnimationFrame || function(fn) {
-        return setTimeout(fn, 1000/60);
-      };
-      var cancelAnimationFrame = window.cancelAnimationFrame || clearTimeout;
-
-      function done() {
-        if (tick == null) return;
-        tick = null;
-        completion.close();
-        completion.cm.off("cursorActivity", activity);
-        if (data) CodeMirror.signal(data, "close");
+    cursorActivity: function() {
+      if (this.debounce) {
+        cancelAnimationFrame(this.debounce);
+        this.debounce = 0;
       }
 
-      function update(myTick) {
-        if (tick == null) return;
-        var myTick = ++tick;
-        if (data) CodeMirror.signal(data, "update");
-        retrieveHints(completion.options.hint, completion.cm, completion.options,
-                      function(d) { finishUpdate(d, myTick); });
-      }
-      function finishUpdate(data_, myTick) {
-        if (tick != myTick) return;
-        data = data_;
-        var picked = completion.widget && completion.widget.picked;
-        if (completion.widget) completion.widget.close();
-        if (data && data.list.length) {
-          if (picked && data.list.length == 1) completion.pick(data, 0);
-          else completion.widget = new Widget(completion, data);
-        }
+      var pos = this.cm.getCursor(), line = this.cm.getLine(pos.line);
+      if (pos.line != this.startPos.line || line.length - pos.ch != this.startLen - this.startPos.ch ||
+          pos.ch < this.startPos.ch || this.cm.somethingSelected() ||
+          (pos.ch && this.options.closeCharacters.test(line.charAt(pos.ch - 1)))) {
+        this.close();
+      } else {
+        var self = this;
+        this.debounce = requestAnimationFrame(function() {self.update();});
+        if (this.widget) this.widget.disable();
       }
+    },
 
-      function clearDebounce() {
-        if (debounce) {
-          cancelAnimationFrame(debounce);
-          debounce = 0;
-        }
+    update: function() {
+      if (this.tick == null) return;
+      if (this.data) CodeMirror.signal(this.data, "update");
+      if (!this.options.hint.async) {
+        this.finishUpdate(this.options.hint(this.cm, this.options), myTick);
+      } else {
+        var myTick = ++this.tick, self = this;
+        this.options.hint(this.cm, function(data) {
+          if (self.tick == myTick) self.finishUpdate(data);
+        }, this.options);
       }
+    },
 
-      function activity() {
-        clearDebounce();
-        var pos = completion.cm.getCursor(), line = completion.cm.getLine(pos.line);
-        if (pos.line != startPos.line || line.length - pos.ch != startLen - startPos.ch ||
-            pos.ch < startPos.ch || completion.cm.somethingSelected() ||
-            (pos.ch && closeOn.test(line.charAt(pos.ch - 1)))) {
-          completion.close();
-        } else {
-          debounce = requestAnimationFrame(update);
-          if (completion.widget) completion.widget.disable();
-        }
+    finishUpdate: function(data) {
+      this.data = data;
+      var picked = this.widget && this.widget.picked;
+      if (this.widget) this.widget.close();
+      if (data && data.list.length) {
+        if (picked && data.list.length == 1) this.pick(data, 0);
+        else this.widget = new Widget(this, data);
       }
-      this.cm.on("cursorActivity", activity);
-      this.onClose = done;
+    },
+
+    showWidget: function(data) {
+      this.data = data;
+      this.widget = new Widget(this, data);
+      CodeMirror.signal(data, "shown");
     },
 
     buildOptions: function(options) {

From ee5d717e3354dee06dbc85bf8bfa132ed633a076 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 10 Apr 2015 12:27:19 +0200
Subject: [PATCH 47/72] Only treat fast clicks on selection as cursor-placing

So that dragging and then coming back to origin point does not
clear the selection.

Issue #3151
---
 lib/codemirror.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index f5b1b8c904..2c102e9d77 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3571,7 +3571,7 @@
   // Start a text drag. When it ends, see if any dragging actually
   // happen, and treat as a click if it didn't.
   function leftButtonStartDrag(cm, e, start, modifier) {
-    var display = cm.display;
+    var display = cm.display, startTime = +new Date;
     var dragEnd = operation(cm, function(e2) {
       if (webkit) display.scroller.draggable = false;
       cm.state.draggingText = false;
@@ -3579,7 +3579,7 @@
       off(display.scroller, "drop", dragEnd);
       if (Math.abs(e.clientX - e2.clientX) + Math.abs(e.clientY - e2.clientY) < 10) {
         e_preventDefault(e2);
-        if (!modifier)
+        if (!modifier && +new Date - 200 < startTime)
           extendSelection(cm.doc, start);
         // Work around unexplainable focus problem in IE9 (#2127) and Chrome (#3081)
         if (webkit || ie && ie_version == 9)

From f7a00e0b0c138186232786f547b38e3e2f9cba5d Mon Sep 17 00:00:00 2001
From: Libo Cannici <lcannici@zendesk.com>
Date: Tue, 7 Apr 2015 16:10:09 +0200
Subject: [PATCH 48/72] [handlebars mode] Add

---
 doc/compress.html             |  1 +
 mode/handlebars/handlebars.js | 53 +++++++++++++++++++++++++++++++
 mode/handlebars/index.html    | 73 +++++++++++++++++++++++++++++++++++++++++++
 mode/index.html               |  1 +
 4 files changed, 128 insertions(+)
 create mode 100644 mode/handlebars/handlebars.js
 create mode 100644 mode/handlebars/index.html

diff --git a/doc/compress.html b/doc/compress.html
index daed505ac3..f34e28b97e 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -132,6 +132,7 @@
           <option value="http://codemirror.net/mode/go/go.js">go.js</option>
           <option value="http://codemirror.net/mode/groovy/groovy.js">groovy.js</option>
           <option value="http://codemirror.net/mode/haml/haml.js">haml.js</option>
+          <option value="http://codemirror.net/mode/handlebars/handlebars.js">handlebars.js</option>
           <option value="http://codemirror.net/mode/haskell/haskell.js">haskell.js</option>
           <option value="http://codemirror.net/mode/haxe/haxe.js">haxe.js</option>
           <option value="http://codemirror.net/mode/htmlembedded/htmlembedded.js">htmlembedded.js</option>
diff --git a/mode/handlebars/handlebars.js b/mode/handlebars/handlebars.js
new file mode 100644
index 0000000000..91b7df2b44
--- /dev/null
+++ b/mode/handlebars/handlebars.js
@@ -0,0 +1,53 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../../addon/mode/simple"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../../addon/mode/simple"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineSimpleMode("hbs", {
+    start: [
+      { regex: /\{\{!--/, push: "dash_comment", token: "comment" },
+      { regex: /\{\{!/,   push: "comment", token: "comment" },
+      { regex: /\{\{/,    push: "handlebars", token: "tag" }
+    ],
+    handlebars: [
+      { regex: /\}\}/, pop: true, token: "tag" },
+
+      // Double and single quotes
+      { regex: /"(?:[^\\]|\\.)*?"/, token: "string" },
+      { regex: /'(?:[^\\]|\\.)*?'/, token: "string" },
+
+      // Handlebars keywords
+      { regex: />|[#\/]([A-Za-z_]\w*)/, token: "keyword" },
+      { regex: /(?:else|this)\b/, token: "keyword" },
+
+      // Numeral
+      { regex: /\d+/i, token: "number" },
+
+      // Atoms like = and .
+      { regex: /=|~|@|true|false/, token: "atom" },
+
+      // Paths
+      { regex: /(?:\.\.\/)*(?:[A-Za-z_][\w\.]*)+/, token: "variable-2" }
+    ],
+    dash_comment: [
+      { regex: /--\}\}/, pop: true, token: "comment" },
+
+      // Commented code
+      { regex: /./, token: "comment"}
+    ],
+    comment: [
+      { regex: /\}\}/, pop: true, token: "comment" },
+      { regex: /./, token: "comment" }
+    ]
+  });
+
+  CodeMirror.defineMIME("text/x-handlebars-template", "hbs");
+});
diff --git a/mode/handlebars/index.html b/mode/handlebars/index.html
new file mode 100644
index 0000000000..90644256fa
--- /dev/null
+++ b/mode/handlebars/index.html
@@ -0,0 +1,73 @@
+<!doctype html>
+
+<title>CodeMirror: Handlebars mode</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="../../doc/docs.css">
+
+<link rel="stylesheet" href="../../lib/codemirror.css">
+<script src="../../lib/codemirror.js"></script>
+<script src="../../addon/mode/simple.js"></script>
+<script src="handlebars.js"></script>
+<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+<div id=nav>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+
+  <ul>
+    <li><a href="../../index.html">Home</a>
+    <li><a href="../../doc/manual.html">Manual</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">HTML mixed</a>
+  </ul>
+</div>
+
+<article>
+<h2>Handlebars</h2>
+<form><textarea id="code" name="code">
+{{> breadcrumbs}}
+
+{{!--
+  You can use the t function to get
+  content translated to the current locale, es:
+  {{t 'article_list'}}
+--}}
+
+<h1>{{t 'article_list'}}</h1>
+
+{{! one line comment }}
+
+{{#each articles}}
+  {{~title}}
+  <p>{{excerpt body size=120 ellipsis=true}}</p>
+
+  {{#with author}}
+    written by {{first_name}} {{last_name}}
+    from category: {{../category.title}}
+    {{#if @../last}}foobar!{{/if}}
+  {{/with~}}
+
+  {{#if promoted.latest}}Read this one! {{else}} This is ok! {{/if}}
+
+  {{#if @last}}<hr>{{/if}}
+{{/each}}
+
+{{#form new_comment}}
+  <input type="text" name="body">
+{{/form}}
+
+</textarea></form>
+    <script>
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+        lineNumbers: true,
+        matchBrackets: true,
+        mode: "text/x-handlebars-template"
+      });
+    </script>
+    </script>
+
+    <p>Handlebars syntax highlighting for CodeMirror.</p>
+
+    <p><strong>MIME types defined:</strong> <code>text/x-handlebars-template</code></p>
+</article>
diff --git a/mode/index.html b/mode/index.html
index 422c8233b5..245595de4e 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -60,6 +60,7 @@
       <li><a href="go/index.html">Go</a></li>
       <li><a href="groovy/index.html">Groovy</a></li>
       <li><a href="haml/index.html">HAML</a></li>
+      <li><a href="handlebars/index.html">Handlebars</a></li>
       <li><a href="haskell/index.html">Haskell</a></li>
       <li><a href="haxe/index.html">Haxe</a></li>
       <li><a href="htmlmixed/index.html">HTML mixed-mode</a></li>

From a405048ed66c322b6ff9c657511cb1e962bdb071 Mon Sep 17 00:00:00 2001
From: David Barnett <dbarnett@google.com>
Date: Sat, 11 Apr 2015 12:02:42 -0700
Subject: [PATCH 49/72] [vim] Exit vim ex/search on last backspace and clear
 input with Ctrl-U

---
 keymap/vim.js    | 14 ++++++++++++--
 test/vim_test.js | 38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 272ba02f8c..384f347044 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1178,7 +1178,8 @@
         }
         function onPromptKeyDown(e, query, close) {
           var keyName = CodeMirror.keyName(e);
-          if (keyName == 'Esc' || keyName == 'Ctrl-C' || keyName == 'Ctrl-[') {
+          if (keyName == 'Esc' || keyName == 'Ctrl-C' || keyName == 'Ctrl-[' ||
+              (keyName == 'Backspace' && query == '')) {
             vimGlobalState.searchHistoryController.pushInput(query);
             vimGlobalState.searchHistoryController.reset();
             updateSearchQuery(cm, originalQuery);
@@ -1188,6 +1189,10 @@
             clearInputState(cm);
             close();
             cm.focus();
+          } else if (keyName == 'Ctrl-U') {
+            // Ctrl-U clears input.
+            CodeMirror.e_stop(e);
+            close('');
           }
         }
         switch (command.searchArgs.querySrc) {
@@ -1248,7 +1253,8 @@
         }
         function onPromptKeyDown(e, input, close) {
           var keyName = CodeMirror.keyName(e), up;
-          if (keyName == 'Esc' || keyName == 'Ctrl-C' || keyName == 'Ctrl-[') {
+          if (keyName == 'Esc' || keyName == 'Ctrl-C' || keyName == 'Ctrl-[' ||
+              (keyName == 'Backspace' && input == '')) {
             vimGlobalState.exCommandHistoryController.pushInput(input);
             vimGlobalState.exCommandHistoryController.reset();
             CodeMirror.e_stop(e);
@@ -1260,6 +1266,10 @@
             up = keyName == 'Up' ? true : false;
             input = vimGlobalState.exCommandHistoryController.nextMatch(input, up) || '';
             close(input);
+          } else if (keyName == 'Ctrl-U') {
+            // Ctrl-U clears input.
+            CodeMirror.e_stop(e);
+            close('');
           } else {
             if ( keyName != 'Left' && keyName != 'Right' && keyName != 'Ctrl' && keyName != 'Alt' && keyName != 'Shift')
               vimGlobalState.exCommandHistoryController.reset();
diff --git a/test/vim_test.js b/test/vim_test.js
index 69a7cb6f5c..9df4414aaf 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -2723,6 +2723,44 @@ testVim('exCommand_history', function(cm, vim, helpers) {
   onKeyDown({keyCode: keyCodes.Up}, input, close);
   eq(input, 'sort');
 }, {value: ''});
+testVim('search_clear', function(cm, vim, helpers) {
+  var onKeyDown;
+  var input = '';
+  var keyCodes = {
+    Ctrl: 17,
+    u: 85
+  };
+  cm.openDialog = function(template, callback, options) {
+    onKeyDown = options.onKeyDown;
+  };
+  var close = function(newVal) {
+    if (typeof newVal == 'string') input = newVal;
+  }
+  helpers.doKeys('/');
+  input = 'foo';
+  onKeyDown({keyCode: keyCodes.Ctrl}, input, close);
+  onKeyDown({keyCode: keyCodes.u, ctrlKey: true}, input, close);
+  eq(input, '');
+});
+testVim('exCommand_clear', function(cm, vim, helpers) {
+  var onKeyDown;
+  var input = '';
+  var keyCodes = {
+    Ctrl: 17,
+    u: 85
+  };
+  cm.openDialog = function(template, callback, options) {
+    onKeyDown = options.onKeyDown;
+  };
+  var close = function(newVal) {
+    if (typeof newVal == 'string') input = newVal;
+  }
+  helpers.doKeys(':');
+  input = 'foo';
+  onKeyDown({keyCode: keyCodes.Ctrl}, input, close);
+  onKeyDown({keyCode: keyCodes.u, ctrlKey: true}, input, close);
+  eq(input, '');
+});
 testVim('.', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('2', 'd', 'w');

From ddbf33f3b4e964ef849b5e8e42bfc367f83d5cc2 Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Sun, 12 Apr 2015 09:41:27 -0400
Subject: [PATCH 50/72] [vim] Allow options to have callbacks

---
 keymap/vim.js    | 25 +++++++++++++++++++------
 test/vim_test.js | 23 +++++++++++++++++++++++
 2 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 384f347044..22bb5342d8 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -382,14 +382,19 @@
     }
 
     var options = {};
-    function defineOption(name, defaultValue, type) {
-      if (defaultValue === undefined) { throw Error('defaultValue is required'); }
+    function defineOption(name, defaultValue, type, callback) {
+      if (defaultValue === undefined && !callback) {
+        throw Error('defaultValue is required unless callback is provided');
+      }
       if (!type) { type = 'string'; }
       options[name] = {
         type: type,
-        defaultValue: defaultValue
+        defaultValue: defaultValue,
+        callback: callback
       };
-      setOption(name, defaultValue);
+      if (defaultValue) {
+        setOption(name, defaultValue);
+      }
     }
 
     function setOption(name, value) {
@@ -405,7 +410,11 @@
           value = true;
         }
       }
-      option.value = option.type == 'boolean' ? !!value : value;
+      if (option.callback) {
+        option.callback(value);
+      } else {
+        option.value = option.type == 'boolean' ? !!value : value;
+      }
     }
 
     function getOption(name) {
@@ -413,7 +422,11 @@
       if (!option) {
         throw Error('Unknown option: ' + name);
       }
-      return option.value;
+      if (option.callback) {
+        return option.callback();
+      } else {
+        return option.value;
+      }
     }
 
     var createCircularJumpList = function() {
diff --git a/test/vim_test.js b/test/vim_test.js
index 9df4414aaf..2781bdaa85 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -3720,6 +3720,29 @@ testVim('ex_set_string', function(cm, vim, helpers) {
   helpers.doEx('set testoption=c')
   eq('c', CodeMirror.Vim.getOption('testoption'));
 });
+testVim('ex_set_callback', function(cm, vim, helpers) {
+  var storedVal = 'a';
+
+  function cb(val) {
+    if (val === undefined) {
+      return storedVal;
+    } else {
+      storedVal = val;
+    }
+  }
+
+  CodeMirror.Vim.defineOption('testcboption', undefined, 'string', cb);
+  // Test default value is set.
+  eq('a', CodeMirror.Vim.getOption('testcboption'));
+  try {
+    // Test fail to set 'notestcboption'
+    helpers.doEx('set notestcboption=b');
+    fail();
+  } catch (expected) {};
+  // Test setOption
+  helpers.doEx('set testcboption=c')
+  eq('c', CodeMirror.Vim.getOption('testcboption'));
+})
 // TODO: Reset key maps after each test.
 testVim('ex_map_key2key', function(cm, vim, helpers) {
   helpers.doEx('map a x');

From 4febeb32f79684c3c4310ed330d6c390ac333086 Mon Sep 17 00:00:00 2001
From: Marcel Gerber <mg.hain@gmx.de>
Date: Sat, 11 Apr 2015 14:34:11 +0200
Subject: [PATCH 51/72] [manual] Remove description of `crudeMeasuringFrom`
 option

It was removed in 957771b2328f737aa42da64c8ca112568e225d95
---
 doc/manual.html | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 63b22bf693..37f2df3550 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -450,18 +450,6 @@ <h3 id=modloader>Module loaders</h3>
       10 000. You can set this to <code>Infinity</code> to turn off
       this behavior.</dd>
 
-      <dt id="option_crudeMeasuringFrom"><code><strong>crudeMeasuringFrom</strong>: number</code></dt>
-      <dd>When measuring the character positions in long lines, any
-      line longer than this number (default is 10 000),
-      when <a href="#option_lineWrapping">line wrapping</a>
-      is <strong>off</strong>, will simply be assumed to consist of
-      same-sized characters. This means that, on the one hand,
-      measuring will be inaccurate when characters of varying size,
-      right-to-left text, markers, or other irregular elements are
-      present. On the other hand, it means that having such a line
-      won't freeze the user interface because of the expensiveness of
-      the measurements.</dd>
-
       <dt id="option_viewportMargin"><code><strong>viewportMargin</strong>: integer</code></dt>
       <dd>Specifies the amount of lines that are rendered above and
       below the part of the document that's currently scrolled into

From e22891bf7bbdd864bdba33d3684ffc363ac45f19 Mon Sep 17 00:00:00 2001
From: Paris <paris@sourcelair.com>
Date: Fri, 10 Apr 2015 20:37:39 +0300
Subject: [PATCH 52/72] [django mode] Rewrite and improve

 - Add string recognition
 - Include (most probably) all built-in template tags
 - Return null as fallback
 - Operator highlighting
 - Change demo theme to `mdn-like` which sports richer highlighting.
 - Highlight comments
 - Define `blockCommentStart` and `blockCommentEnd`
---
 mode/django/django.js  | 331 +++++++++++++++++++++++++++++++++++++++++++++----
 mode/django/index.html |  44 ++++---
 2 files changed, 334 insertions(+), 41 deletions(-)

diff --git a/mode/django/django.js b/mode/django/django.js
index d70b2fe948..2f08b06312 100644
--- a/mode/django/django.js
+++ b/mode/django/django.js
@@ -14,46 +14,329 @@
   "use strict";
 
   CodeMirror.defineMode("django:inner", function() {
-    var keywords = ["block", "endblock", "for", "endfor", "in", "true", "false",
-                    "loop", "none", "self", "super", "if", "endif", "as", "not", "and",
+    var keywords = ["block", "endblock", "for", "endfor", "true", "false",
+                    "loop", "none", "self", "super", "if", "endif", "as",
                     "else", "import", "with", "endwith", "without", "context", "ifequal", "endifequal",
-                    "ifnotequal", "endifnotequal", "extends", "include", "load", "length", "comment",
-                    "endcomment", "empty"];
-    keywords = new RegExp("^((" + keywords.join(")|(") + "))\\b");
+                    "ifnotequal", "endifnotequal", "extends", "include", "load", "comment",
+                    "endcomment", "empty", "url", "static", "trans", "blocktrans", "now", "regroup",
+                    "lorem", "ifchanged", "endifchanged", "firstof", "debug", "cycle", "csrf_token",
+                    "autoescape", "endautoescape", "spaceless", "ssi", "templatetag",
+                    "verbatim", "endverbatim", "widthratio"],
+        filters = ["add", "addslashes", "capfirst", "center", "cut", "date",
+                   "default", "default_if_none", "dictsort",
+                   "dictsortreversed", "divisibleby", "escape", "escapejs",
+                   "filesizeformat", "first", "floatformat", "force_escape",
+                   "get_digit", "iriencode", "join", "last", "length",
+                   "length_is", "linebreaks", "linebreaksbr", "linenumbers",
+                   "ljust", "lower", "make_list", "phone2numeric", "pluralize",
+                   "pprint", "random", "removetags", "rjust", "safe",
+                   "safeseq", "slice", "slugify", "stringformat", "striptags",
+                   "time", "timesince", "timeuntil", "title", "truncatechars",
+                   "truncatechars_html", "truncatewords", "truncatewords_html",
+                   "unordered_list", "upper", "urlencode", "urlize",
+                   "urlizetrunc", "wordcount", "wordwrap", "yesno"],
+        operators = ["==", "!=", "<", ">", "<=", ">=", "in", "not", "or", "and"];
 
+    keywords = new RegExp("^\\b(" + keywords.join("|") + ")\\b");
+    filters = new RegExp("^\\b(" + filters.join("|") + ")\\b");
+    operators = new RegExp("^\\b(" + operators.join("|") + ")\\b");
+
+    // We have to return "null" instead of null, in order to avoid string
+    // styling as the default, when using Django templates inside HTML
+    // element attributes
     function tokenBase (stream, state) {
-      stream.eatWhile(/[^\{]/);
-      var ch = stream.next();
-      if (ch == "{") {
-        if (ch = stream.eat(/\{|%|#/)) {
-          state.tokenize = inTag(ch);
-          return "tag";
+      // Attempt to identify a variable, template or comment tag respectively
+      if (stream.match("{{")) {
+        state.tokenize = inVariable;
+        return "tag";
+      } else if (stream.match("{%")) {
+        state.tokenize = inTag;
+        return "tag";
+      } else if (stream.match("{#")) {
+        state.tokenize = inComment;
+        return "comment";
+      }
+
+      // Ignore completely any stream series that do not match the
+      // Django template opening tags.
+      while (stream.next() != null && !stream.match("{{", false) && !stream.match("{%", false)) {}
+      return null;
+    }
+
+    // A string can be included in either single or double quotes (this is
+    // the delimeter). Mark everything as a string until the start delimeter
+    // occurs again.
+    function inString (delimeter, previousTokenizer) {
+      return function (stream, state) {
+        if (!state.escapeNext && stream.eat(delimeter)) {
+          state.tokenize = previousTokenizer;
+        } else {
+          if (state.escapeNext) {
+            state.escapeNext = false;
+          }
+
+          var ch = stream.next();
+
+          // Take into account the backslash for escaping characters, such as
+          // the string delimeter.
+          if (ch == "\\") {
+            state.escapeNext = true;
+          }
+        }
+
+        return "string";
+      };
+    }
+
+    // Apply Django template variable syntax highlighting
+    function inVariable (stream, state) {
+      // Attempt to match a dot that precedes a property
+      if (state.waitDot) {
+        state.waitDot = false;
+
+        if (stream.peek() != ".") {
+          return "null";
+        }
+
+        // Dot folowed by a non-word character should be considered an error.
+        if (stream.match(/\.\W+/)) {
+          return "error";
+        } else if (stream.eat(".")) {
+          state.waitProperty = true;
+          return "null";
+        } else {
+          throw Error ("Unexpected error while waiting for property.");
+        }
+      }
+
+      // Attempt to match a pipe that precedes a filter
+      if (state.waitPipe) {
+        state.waitPipe = false;
+
+        if (stream.peek() != "|") {
+          return "null";
+        }
+
+        // Pipe folowed by a non-word character should be considered an error.
+        if (stream.match(/\.\W+/)) {
+          return "error";
+        } else if (stream.eat("|")) {
+          state.waitFilter = true;
+          return "null";
+        } else {
+          throw Error ("Unexpected error while waiting for filter.");
+        }
+      }
+
+      // Highlight properties
+      if (state.waitProperty) {
+        state.waitProperty = false;
+        if (stream.match(/\b(\w+)\b/)) {
+          state.waitDot = true;  // A property can be followed by another property
+          state.waitPipe = true;  // A property can be followed by a filter
+          return "property";
         }
       }
+
+      // Highlight filters
+      if (state.waitFilter) {
+          state.waitFilter = false;
+        if (stream.match(filters)) {
+          return "variable-2";
+        }
+      }
+
+      // Ignore all white spaces
+      if (stream.eatSpace()) {
+        state.waitProperty = false;
+        return "null";
+      }
+
+      // Identify numbers
+      if (stream.match(/\b\d+(\.\d+)?\b/)) {
+        return "number";
+      }
+
+      // Identify strings
+      if (stream.match("'")) {
+        state.tokenize = inString("'", state.tokenize);
+        return "string";
+      } else if (stream.match('"')) {
+        state.tokenize = inString('"', state.tokenize);
+        return "string";
+      }
+
+      // Attempt to find the variable
+      if (stream.match(/\b(\w+)\b/) && !state.foundVariable) {
+        state.waitDot = true;
+        state.waitPipe = true;  // A property can be followed by a filter
+        return "variable";
+      }
+
+      // If found closing tag reset
+      if (stream.match("}}")) {
+        state.waitProperty = null;
+        state.waitFilter = null;
+        state.waitDot = null;
+        state.waitPipe = null;
+        state.tokenize = tokenBase;
+        return "tag";
+      }
+
+      // If nothing was found, advance to the next character
+      stream.next();
+      return "null";
     }
-    function inTag (close) {
-      if (close == "{") {
-        close = "}";
+
+    function inTag (stream, state) {
+      // Attempt to match a dot that precedes a property
+      if (state.waitDot) {
+        state.waitDot = false;
+
+        if (stream.peek() != ".") {
+          return "null";
+        }
+
+        // Dot folowed by a non-word character should be considered an error.
+        if (stream.match(/\.\W+/)) {
+          return "error";
+        } else if (stream.eat(".")) {
+          state.waitProperty = true;
+          return "null";
+        } else {
+          throw Error ("Unexpected error while waiting for property.");
+        }
       }
-      return function (stream, state) {
-        var ch = stream.next();
-        if ((ch == close) && stream.eat("}")) {
-          state.tokenize = tokenBase;
-          return "tag";
+
+      // Attempt to match a pipe that precedes a filter
+      if (state.waitPipe) {
+        state.waitPipe = false;
+
+        if (stream.peek() != "|") {
+          return "null";
         }
-        if (stream.match(keywords)) {
-          return "keyword";
+
+        // Pipe folowed by a non-word character should be considered an error.
+        if (stream.match(/\.\W+/)) {
+          return "error";
+        } else if (stream.eat("|")) {
+          state.waitFilter = true;
+          return "null";
+        } else {
+          throw Error ("Unexpected error while waiting for filter.");
         }
-        return close == "#" ? "comment" : "string";
-      };
+      }
+
+      // Highlight properties
+      if (state.waitProperty) {
+        state.waitProperty = false;
+        if (stream.match(/\b(\w+)\b/)) {
+          state.waitDot = true;  // A property can be followed by another property
+          state.waitPipe = true;  // A property can be followed by a filter
+          return "property";
+        }
+      }
+
+      // Highlight filters
+      if (state.waitFilter) {
+          state.waitFilter = false;
+        if (stream.match(filters)) {
+          return "variable-2";
+        }
+      }
+
+      // Ignore all white spaces
+      if (stream.eatSpace()) {
+        state.waitProperty = false;
+        return "null";
+      }
+
+      // Identify numbers
+      if (stream.match(/\b\d+(\.\d+)?\b/)) {
+        return "number";
+      }
+
+      // Identify strings
+      if (stream.match("'")) {
+        state.tokenize = inString("'", state.tokenize);
+        return "string";
+      } else if (stream.match('"')) {
+        state.tokenize = inString('"', state.tokenize);
+        return "string";
+      }
+
+      // Attempt to match an operator
+      if (stream.match(operators)) {
+        return "operator";
+      }
+
+      // Attempt to match a keyword
+      var keywordMatch = stream.match(keywords);
+      if (keywordMatch) {
+        if (keywordMatch[0] == "comment") {
+          state.blockCommentTag = true;
+        }
+        return "keyword";
+      }
+
+      // Attempt to match a variable
+      if (stream.match(/\b(\w+)\b/)) {
+        state.waitDot = true;
+        state.waitPipe = true;  // A property can be followed by a filter
+        return "variable";
+      }
+
+      // If found closing tag reset
+      if (stream.match("%}")) {
+        state.waitProperty = null;
+        state.waitFilter = null;
+        state.waitDot = null;
+        state.waitPipe = null;
+        // If the tag that closes is a block comment tag, we want to mark the
+        // following code as comment, until the tag closes.
+        if (state.blockCommentTag) {
+          state.blockCommentTag = false;  // Release the "lock"
+          state.tokenize = inBlockComment;
+        } else {
+          state.tokenize = tokenBase;
+        }
+        return "tag";
+      }
+
+      // If nothing was found, advance to the next character
+      stream.next();
+      return "null";
+    }
+
+    // Mark everything as comment inside the tag and the tag itself.
+    function inComment (stream, state) {
+      if (stream.match("#}")) {
+        state.tokenize = tokenBase;
+      }
+      return "comment";
+    }
+
+    // Mark everything as a comment until the `blockcomment` tag closes.
+    function inBlockComment (stream, state) {
+      if (stream.match(/\{%\s*endcomment\s*%\}/, false)) {
+        state.tokenize = inTag;
+        stream.match("{%");
+        return "tag";
+      } else {
+        stream.next();
+        return "comment";
+      }
     }
+
     return {
       startState: function () {
         return {tokenize: tokenBase};
       },
       token: function (stream, state) {
         return state.tokenize(stream, state);
-      }
+      },
+      blockCommentStart: "{% comment %}",
+      blockCommentEnd: "{% endcomment %}"
     };
   });
 
diff --git a/mode/django/index.html b/mode/django/index.html
index 79d9a6a04b..41ea07c91b 100644
--- a/mode/django/index.html
+++ b/mode/django/index.html
@@ -5,6 +5,7 @@
 <link rel=stylesheet href="../../doc/docs.css">
 
 <link rel="stylesheet" href="../../lib/codemirror.css">
+<link rel="stylesheet" href="../../theme/mdn-like.css">
 <script src="../../lib/codemirror.js"></script>
 <script src="../../addon/mode/overlay.js"></script>
 <script src="../xml/xml.js"></script>
@@ -30,21 +31,29 @@
 <form><textarea id="code" name="code">
 <!doctype html>
 <html>
-    <head>
-        <title>My Django web application</title>
-    </head>
-    <body>
-        <h1>
-            {{ page.title }}
-        </h1>
-        <ul class="my-list">
-            {% for item in items %}
-                <li>{% item.name %}</li>
-            {% empty %}
-                <li>You have no items in your list.</li>
-            {% endfor %}
-        </ul>
-    </body>
+  <head>
+    <title>My Django web application</title>
+  </head>
+  <body>
+    <h1>
+      {{ page.title|capfirst }}
+    </h1>
+    <ul class="my-list">
+      {# traverse a list of items and produce links to their views. #}
+      {% for item in items %}
+      <li>
+        <a href="{% url 'item_view' item.name|slugify %}">
+          {{ item.name }}
+        </a>
+      </li>
+      {% empty %}
+      <li>You have no items in your list.</li>
+      {% endfor %}
+    </ul>
+    {% comment "this is a forgotten footer" %}
+    <footer></footer>
+    {% endcomment %}
+  </body>
 </html>
 </textarea></form>
 
@@ -52,8 +61,9 @@
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
         lineNumbers: true,
         mode: "django",
-        indentUnit: 4,
-        indentWithTabs: true
+        indentUnit: 2,
+        indentWithTabs: true,
+        theme: "mdn-like"
       });
     </script>
 

From 5c907055baf600b5523650fa423af561cd4dc8ad Mon Sep 17 00:00:00 2001
From: Christopher Mitchell <github@cemetech.net>
Date: Sat, 11 Apr 2015 01:12:52 -0400
Subject: [PATCH 53/72] [z80 mode] Improved, fixed ASM example, added ez80 mode

---
 mode/z80/index.html | 15 ++++++++-------
 mode/z80/z80.js     | 52 ++++++++++++++++++++++++++++++++++------------------
 2 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/mode/z80/index.html b/mode/z80/index.html
index 1ad3ace046..a41b7473e2 100644
--- a/mode/z80/index.html
+++ b/mode/z80/index.html
@@ -29,17 +29,18 @@
 <div><textarea id="code" name="code">
 #include    "ti83plus.inc"
 #define     progStart   $9D95
-.org        progStart-2
-.db         $BB,$6D
+    .org progStart-2
+    .db $BB,$6D
+
     bcall(_ClrLCDFull)
-    ld  HL, 0
-    ld  (PenCol),   HL
-    ld  HL, Message
+    ld hl,0
+    ld (CurCol),hl
+    ld hl,Message
     bcall(_PutS) ; Displays the string
     bcall(_NewLine)
     ret
 Message:
-.db         "Hello world!",0
+    .db "Hello world!",0
 </textarea></div>
 
     <script>
@@ -48,5 +49,5 @@
       });
     </script>
 
-    <p><strong>MIME type defined:</strong> <code>text/x-z80</code>.</p>
+    <p><strong>MIME types defined:</strong> <code>text/x-z80</code>, <code>text/x-ez80</code>.</p>
   </article>
diff --git a/mode/z80/z80.js b/mode/z80/z80.js
index ec41d050ac..aae70216f8 100644
--- a/mode/z80/z80.js
+++ b/mode/z80/z80.js
@@ -3,26 +3,35 @@
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
+  mod(require("../../lib/codemirror"));
   else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
+  define(["../../lib/codemirror"], mod);
   else // Plain browser env
-    mod(CodeMirror);
+  mod(CodeMirror);
 })(function(CodeMirror) {
 "use strict";
 
-CodeMirror.defineMode('z80', function() {
-  var keywords1 = /^(exx?|(ld|cp|in)([di]r?)?|pop|push|ad[cd]|cpl|daa|dec|inc|neg|sbc|sub|and|bit|[cs]cf|x?or|res|set|r[lr]c?a?|r[lr]d|s[lr]a|srl|djnz|nop|rst|[de]i|halt|im|ot[di]r|out[di]?)\b/i;
-  var keywords2 = /^(call|j[pr]|ret[in]?)\b/i;
-  var keywords3 = /^b_?(call|jump)\b/i;
+CodeMirror.defineMode('z80', function(_config, parserConfig) {
+  var ez80 = parserConfig.ez80;
+  var keywords1, keywords2;
+  if (ez80) {
+    keywords1 = /^(exx?|(ld|cp)([di]r?)?|[lp]ea|pop|push|ad[cd]|cpl|daa|dec|inc|neg|sbc|sub|and|bit|[cs]cf|x?or|res|set|r[lr]c?a?|r[lr]d|s[lr]a|srl|djnz|nop|[de]i|halt|im|in([di]mr?|ir?|irx|2r?)|ot(dmr?|[id]rx|imr?)|out(0?|[di]r?|[di]2r?)|tst(io)?|slp)(\.([sl]?i)?[sl])?\b/i;
+    keywords2 = /^(((call|j[pr]|rst|ret[in]?)(\.([sl]?i)?[sl])?)|(rs|st)mix)\b/i;
+  } else {
+    keywords1 = /^(exx?|(ld|cp|in)([di]r?)?|pop|push|ad[cd]|cpl|daa|dec|inc|neg|sbc|sub|and|bit|[cs]cf|x?or|res|set|r[lr]c?a?|r[lr]d|s[lr]a|srl|djnz|nop|rst|[de]i|halt|im|ot[di]r|out[di]?)\b/i;
+    keywords2 = /^(call|j[pr]|ret[in]?|b_?(call|jump))\b/i;
+  }
+
   var variables1 = /^(af?|bc?|c|de?|e|hl?|l|i[xy]?|r|sp)\b/i;
   var variables2 = /^(n?[zc]|p[oe]?|m)\b/i;
   var errors = /^([hl][xy]|i[xy][hl]|slia|sll)\b/i;
-  var numbers = /^([\da-f]+h|[0-7]+o|[01]+b|\d+)\b/i;
+  var numbers = /^([\da-f]+h|[0-7]+o|[01]+b|\d+d?)\b/i;
 
   return {
     startState: function() {
-      return {context: 0};
+      return {
+        context: 0
+      };
     },
     token: function(stream, state) {
       if (!stream.column())
@@ -34,14 +43,21 @@ CodeMirror.defineMode('z80', function() {
       var w;
 
       if (stream.eatWhile(/\w/)) {
+        if (ez80 && stream.eat('.')) {
+          stream.eatWhile(/\w/);
+        }
         w = stream.current();
 
         if (stream.indentation()) {
-          if (state.context == 1 && variables1.test(w))
-            return 'variable-2';
+          if ((state.context == 1 || state.context == 4) && variables1.test(w)) {
+            state.context = 4;
+            return 'var2';
+          }
 
-          if (state.context == 2 && variables2.test(w))
-            return 'variable-3';
+          if (state.context == 2 && variables2.test(w)) {
+            state.context = 4;
+            return 'var3';
+          }
 
           if (keywords1.test(w)) {
             state.context = 1;
@@ -49,14 +65,13 @@ CodeMirror.defineMode('z80', function() {
           } else if (keywords2.test(w)) {
             state.context = 2;
             return 'keyword';
-          } else if (keywords3.test(w)) {
-            state.context = 3;
-            return 'keyword';
+          } else if (state.context == 4 && numbers.test(w)) {
+            return 'number';
           }
 
           if (errors.test(w))
             return 'error';
-        } else if (numbers.test(w)) {
+        } else if (stream.match(numbers)) {
           return 'number';
         } else {
           return null;
@@ -77,7 +92,7 @@ CodeMirror.defineMode('z80', function() {
         if (stream.match(/\\?.'/))
           return 'number';
       } else if (stream.eat('.') || stream.sol() && stream.eat('#')) {
-        state.context = 4;
+        state.context = 5;
 
         if (stream.eatWhile(/\w/))
           return 'def';
@@ -96,5 +111,6 @@ CodeMirror.defineMode('z80', function() {
 });
 
 CodeMirror.defineMIME("text/x-z80", "z80");
+CodeMirror.defineMIME("text/x-ez80", { name: "z80", ez80: true });
 
 });

From 2e16ef661fd9a7261d143b23d22df87d3a75237c Mon Sep 17 00:00:00 2001
From: mtaran-google <mtaran@google.com>
Date: Fri, 10 Apr 2015 16:13:13 -0500
Subject: [PATCH 54/72] [python mode] better highlighting for and/or/not

Currently and/or/not in most themes look like normal text because cm-operator doesn't usually get special styling. This patch highlights them as keywords to make them stand out better.
---
 mode/python/python.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/mode/python/python.js b/mode/python/python.js
index 979e849822..cdb58bbbb1 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -162,15 +162,13 @@
       if (stream.match(tripleDelimiters) || stream.match(doubleDelimiters))
         return null;
 
-      if (stream.match(doubleOperators)
-          || stream.match(singleOperators)
-          || stream.match(wordOperators))
+      if (stream.match(doubleOperators) || stream.match(singleOperators))
         return "operator";
 
       if (stream.match(singleDelimiters))
         return null;
 
-      if (stream.match(keywords))
+      if (stream.match(keywords) || stream.match(wordOperators))
         return "keyword";
 
       if (stream.match(builtins))

From 5f44dd5beed558b78d174b150d3daf6b442d617d Mon Sep 17 00:00:00 2001
From: mtaran-google <mtaran@google.com>
Date: Fri, 10 Apr 2015 15:27:30 -0500
Subject: [PATCH 55/72] [clike mode] Remove C 'entry' keyword

It was never standardized and is no longer a reserved word: http://publications.gbdirect.co.uk/c_book/chapter2/keywords_and_identifiers.html
---
 mode/clike/clike.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index f996f019dc..b209910b92 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -185,7 +185,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     return obj;
   }
   var cKeywords = "auto if break int case long char register continue return default short do sizeof " +
-    "double static else struct entry switch extern typedef float union for unsigned " +
+    "double static else struct switch extern typedef float union for unsigned " +
     "goto while enum void const signed volatile";
 
   function cppHook(stream, state) {

From 9c524fd0cebd0b1967f1034a76246953d9b23ab6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 13 Apr 2015 11:02:37 +0200
Subject: [PATCH 56/72] [multiplex addon] Add parseDelimiters option

And change handlebars demo to use it.
---
 addon/mode/multiplex.js       | 23 ++++++++++++++---------
 doc/manual.html               |  9 ++++++---
 mode/handlebars/handlebars.js |  4 ++--
 mode/handlebars/index.html    | 12 +++++++++++-
 4 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/addon/mode/multiplex.js b/addon/mode/multiplex.js
index 6a95b323c1..fe48c7fbd5 100644
--- a/addon/mode/multiplex.js
+++ b/addon/mode/multiplex.js
@@ -14,12 +14,14 @@
 CodeMirror.multiplexingMode = function(outer /*, others */) {
   // Others should be {open, close, mode [, delimStyle] [, innerStyle]} objects
   var others = Array.prototype.slice.call(arguments, 1);
-  var n_others = others.length;
 
-  function indexOf(string, pattern, from) {
-    if (typeof pattern == "string") return string.indexOf(pattern, from);
+  function indexOf(string, pattern, from, returnEnd) {
+    if (typeof pattern == "string") {
+      var found = string.indexOf(pattern, from);
+      return returnEnd && found > -1 ? found + pattern.length : found;
+    }
     var m = pattern.exec(from ? string.slice(from) : string);
-    return m ? m.index + from : -1;
+    return m ? m.index + from + (returnEnd ? m[0].length : 0) : -1;
   }
 
   return {
@@ -42,11 +44,11 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
     token: function(stream, state) {
       if (!state.innerActive) {
         var cutOff = Infinity, oldContent = stream.string;
-        for (var i = 0; i < n_others; ++i) {
+        for (var i = 0; i < others.length; ++i) {
           var other = others[i];
           var found = indexOf(oldContent, other.open, stream.pos);
           if (found == stream.pos) {
-            stream.match(other.open);
+            if (!other.parseDelimiters) stream.match(other.open);
             state.innerActive = other;
             state.inner = CodeMirror.startState(other.mode, outer.indent ? outer.indent(state.outer, "") : 0);
             return other.delimStyle;
@@ -64,8 +66,8 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
           state.innerActive = state.inner = null;
           return this.token(stream, state);
         }
-        var found = curInner.close ? indexOf(oldContent, curInner.close, stream.pos) : -1;
-        if (found == stream.pos) {
+        var found = curInner.close ? indexOf(oldContent, curInner.close, stream.pos, curInner.parseDelimiters) : -1;
+        if (found == stream.pos && !curInner.parseDelimiters) {
           stream.match(curInner.close);
           state.innerActive = state.inner = null;
           return curInner.delimStyle;
@@ -74,6 +76,9 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
         var innerToken = curInner.mode.token(stream, state.inner);
         if (found > -1) stream.string = oldContent;
 
+        if (found == stream.pos && curInner.parseDelimiters)
+          state.innerActive = state.inner = null;
+
         if (curInner.innerStyle) {
           if (innerToken) innerToken = innerToken + ' ' + curInner.innerStyle;
           else innerToken = curInner.innerStyle;
@@ -95,7 +100,7 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
         mode.blankLine(state.innerActive ? state.inner : state.outer);
       }
       if (!state.innerActive) {
-        for (var i = 0; i < n_others; ++i) {
+        for (var i = 0; i < others.length; ++i) {
           var other = others[i];
           if (other.open === "\n") {
             state.innerActive = other;
diff --git a/doc/manual.html b/doc/manual.html
index 37f2df3550..92340ee199 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2431,7 +2431,7 @@ <h2 id="addons">Addons</h2>
       between several modes.
       Defines <code>CodeMirror.multiplexingMode</code> which, when
       given as first argument a mode object, and as other arguments
-      any number of <code>{open, close, mode [, delimStyle, innerStyle]}</code>
+      any number of <code>{open, close, mode [, delimStyle, innerStyle, parseDelimiters]}</code>
       objects, will return a mode object that starts parsing using the
       mode passed as first argument, but will switch to another mode
       as soon as it encounters a string that occurs in one of
@@ -2443,8 +2443,11 @@ <h2 id="addons">Addons</h2>
       <ul><li>When <code>delimStyle</code> is specified, it will be the token
       style returned for the delimiter tokens.</li>
       <li>When <code>innerStyle</code> is specified, it will be the token
-      style added for each inner mode token.</li></ul>
-      The outer mode will not see the content between the delimiters.
+      style added for each inner mode token.</li>
+      <li>When <code>parseDelimiters</code> is true, the content of
+      the delimiters will also be passed to the inner mode.
+      (And <code>delimStyle</code> is ignored.)</li></ul> The outer
+      mode will not see the content between the delimiters.
       See <a href="../demo/multiplex.html">this demo</a> for an
       example.</dd>
 
diff --git a/mode/handlebars/handlebars.js b/mode/handlebars/handlebars.js
index 91b7df2b44..40dfea42af 100644
--- a/mode/handlebars/handlebars.js
+++ b/mode/handlebars/handlebars.js
@@ -11,7 +11,7 @@
 })(function(CodeMirror) {
   "use strict";
 
-  CodeMirror.defineSimpleMode("hbs", {
+  CodeMirror.defineSimpleMode("handlebars", {
     start: [
       { regex: /\{\{!--/, push: "dash_comment", token: "comment" },
       { regex: /\{\{!/,   push: "comment", token: "comment" },
@@ -49,5 +49,5 @@
     ]
   });
 
-  CodeMirror.defineMIME("text/x-handlebars-template", "hbs");
+  CodeMirror.defineMIME("text/x-handlebars-template", "handlebars");
 });
diff --git a/mode/handlebars/index.html b/mode/handlebars/index.html
index 90644256fa..beaef87a18 100644
--- a/mode/handlebars/index.html
+++ b/mode/handlebars/index.html
@@ -7,6 +7,8 @@
 <link rel="stylesheet" href="../../lib/codemirror.css">
 <script src="../../lib/codemirror.js"></script>
 <script src="../../addon/mode/simple.js"></script>
+<script src="../../addon/mode/multiplex.js"></script>
+<script src="../xml/xml.js"></script>
 <script src="handlebars.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
@@ -59,10 +61,18 @@
 
 </textarea></form>
     <script>
+      CodeMirror.defineMode("htmlhandlebars", function(config) {
+        return CodeMirror.multiplexingMode(
+          CodeMirror.getMode(config, "text/html"),
+          {open: "{{", close: "}}",
+           mode: CodeMirror.getMode(config, "handlebars"),
+           parseDelimiters: true});
+      });
+
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
         lineNumbers: true,
         matchBrackets: true,
-        mode: "text/x-handlebars-template"
+        mode: "htmlhandlebars"
       });
     </script>
     </script>

From 82e86ef74a552916490cf57706c5ce5b4a12b8e1 Mon Sep 17 00:00:00 2001
From: Amin Shali <amshali@google.com>
Date: Mon, 13 Apr 2015 17:38:35 -0700
Subject: [PATCH 57/72] [search addon] Preserve the last search query.

---
 addon/search/search.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/addon/search/search.js b/addon/search/search.js
index 0251067a73..fb85001ca8 100644
--- a/addon/search/search.js
+++ b/addon/search/search.js
@@ -39,7 +39,7 @@
   }
 
   function SearchState() {
-    this.posFrom = this.posTo = this.query = null;
+    this.posFrom = this.posTo = this.lastQuery = this.query = null;
     this.overlay = null;
   }
   function getSearchState(cm) {
@@ -75,7 +75,8 @@
   function doSearch(cm, rev) {
     var state = getSearchState(cm);
     if (state.query) return findNext(cm, rev);
-    dialog(cm, queryDialog, "Search for:", cm.getSelection(), function(query) {
+    var q = cm.getSelection() || state.lastQuery;
+    dialog(cm, queryDialog, "Search for:", q, function(query) {
       cm.operation(function() {
         if (!query || state.query) return;
         state.query = parseQuery(query);
@@ -104,6 +105,7 @@
   });}
   function clearSearch(cm) {cm.operation(function() {
     var state = getSearchState(cm);
+    state.lastQuery = state.query;
     if (!state.query) return;
     state.query = null;
     cm.removeOverlay(state.overlay);
@@ -116,7 +118,8 @@
   var doReplaceConfirm = "Replace? <button>Yes</button> <button>No</button> <button>Stop</button>";
   function replace(cm, all) {
     if (cm.getOption("readOnly")) return;
-    dialog(cm, replaceQueryDialog, "Replace:", cm.getSelection(), function(query) {
+    var q = cm.getSelection() || state.lastQuery;
+    dialog(cm, replaceQueryDialog, "Replace:", q, function(query) {
       if (!query) return;
       query = parseQuery(query);
       dialog(cm, replacementQueryDialog, "Replace with:", "", function(text) {

From d6318cbbb8a0597395969332ebcc3f6f58e14b31 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 14 Apr 2015 09:34:22 +0200
Subject: [PATCH 58/72] [search addon] Clean up previous patch

Issue #3204
---
 addon/search/search.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addon/search/search.js b/addon/search/search.js
index fb85001ca8..1c8ca3c245 100644
--- a/addon/search/search.js
+++ b/addon/search/search.js
@@ -53,7 +53,7 @@
     return cm.getSearchCursor(query, pos, queryCaseInsensitive(query));
   }
   function dialog(cm, text, shortText, deflt, f) {
-    if (cm.openDialog) cm.openDialog(text, f, {value: deflt});
+    if (cm.openDialog) cm.openDialog(text, f, {value: deflt, selectValueOnOpen: true});
     else f(prompt(shortText, deflt));
   }
   function confirmDialog(cm, text, shortText, fs) {
@@ -118,8 +118,8 @@
   var doReplaceConfirm = "Replace? <button>Yes</button> <button>No</button> <button>Stop</button>";
   function replace(cm, all) {
     if (cm.getOption("readOnly")) return;
-    var q = cm.getSelection() || state.lastQuery;
-    dialog(cm, replaceQueryDialog, "Replace:", q, function(query) {
+    var query = cm.getSelection() || getSearchState().lastQuery;
+    dialog(cm, replaceQueryDialog, "Replace:", query, function(query) {
       if (!query) return;
       query = parseQuery(query);
       dialog(cm, replacementQueryDialog, "Replace with:", "", function(text) {

From 717e38d3e5bd08d81cad2758ba2a534b90f3fbd5 Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Tue, 14 Apr 2015 21:04:09 -0400
Subject: [PATCH 59/72] [vim] Fix inifinite loop with visual block eol

https://github.com/codemirror/CodeMirror/issues/3205
---
 keymap/vim.js    | 6 +++---
 test/vim_test.js | 6 +++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 22bb5342d8..6d28c822fb 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1312,8 +1312,8 @@
         var registerName = inputState.registerName;
         var sel = vim.sel;
         // TODO: Make sure cm and vim selections are identical outside visual mode.
-        var origHead = copyCursor(vim.visualMode ? sel.head: cm.getCursor('head'));
-        var origAnchor = copyCursor(vim.visualMode ? sel.anchor : cm.getCursor('anchor'));
+        var origHead = copyCursor(vim.visualMode ? clipCursorToContent(cm, sel.head): cm.getCursor('head'));
+        var origAnchor = copyCursor(vim.visualMode ? clipCursorToContent(cm, sel.anchor) : cm.getCursor('anchor'));
         var oldHead = copyCursor(origHead);
         var oldAnchor = copyCursor(origAnchor);
         var newHead, newAnchor;
@@ -4808,7 +4808,7 @@
     }
     function updateFakeCursor(cm) {
       var vim = cm.state.vim;
-      var from = copyCursor(vim.sel.head);
+      var from = clipCursorToContent(cm, copyCursor(vim.sel.head));
       var to = offsetCursor(from, 0, 1);
       if (vim.fakeCursor) {
         vim.fakeCursor.clear();
diff --git a/test/vim_test.js b/test/vim_test.js
index 2781bdaa85..17e4d80cb7 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1895,7 +1895,11 @@ testVim('visual_block_move_to_eol', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('<C-v>', 'G', '$');
   var selections = cm.getSelections().join();
-  eq("123,45,6", selections);
+  eq('123,45,6', selections);
+  // Checks that with cursor at Infinity, finding words backwards still works.
+  helpers.doKeys('2', 'k', 'b');
+  selections = cm.getSelections().join();
+  eq('1', selections);
 }, {value: '123\n45\n6'});
 testVim('visual_block_different_line_lengths', function(cm, vim, helpers) {
   // test the block selection with lines of different length

From 7191ec62293f44e71150b49372f39ec1684799ec Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 15 Apr 2015 09:28:11 +0200
Subject: [PATCH 60/72] [manual] Mention right PC keybindings for goDocEnd and
 goDocStart

Closes #3207
---
 doc/manual.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 92340ee199..5fc513dac8 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -857,10 +857,10 @@ <h3 id=modloader>Module loaders</h3>
       <dd>Redo the last change to the selection, or the last text change if
       no selection changes remain.</dd>
 
-      <dt class=command id=command_goDocStart><code><strong>goDocStart</strong></code><span class=keybinding>Ctrl-Up (PC), Cmd-Up (Mac), Cmd-Home (Mac)</span></dt>
+      <dt class=command id=command_goDocStart><code><strong>goDocStart</strong></code><span class=keybinding>Ctrl-Home (PC), Cmd-Up (Mac), Cmd-Home (Mac)</span></dt>
       <dd>Move the cursor to the start of the document.</dd>
 
-      <dt class=command id=command_goDocEnd><code><strong>goDocEnd</strong></code><span class=keybinding>Ctrl-Down (PC), Cmd-End (Mac), Cmd-Down (Mac)</span></dt>
+      <dt class=command id=command_goDocEnd><code><strong>goDocEnd</strong></code><span class=keybinding>Ctrl-End (PC), Cmd-End (Mac), Cmd-Down (Mac)</span></dt>
       <dd>Move the cursor to the end of the document.</dd>
 
       <dt class=command id=command_goLineStart><code><strong>goLineStart</strong></code><span class=keybinding>Alt-Left (PC), Ctrl-A (Mac)</span></dt>

From 0b5d0c49d852bbffd11601ebd6ae30dd35ab2f58 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 15 Apr 2015 10:48:08 +0200
Subject: [PATCH 61/72] Handle another bidi corner case

Closes #3172
---
 lib/codemirror.js | 2 ++
 test/test.js      | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 2c102e9d77..dd1a66a480 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8721,6 +8721,8 @@
         lst(order).to -= m[0].length;
         order.push(new BidiSpan(0, len - m[0].length, len));
       }
+      if (order[0].level == 2)
+        order.unshift(new BidiSpan(1, order[0].to, order[0].to))
       if (order[0].level != lst(order).level)
         order.push(new BidiSpan(order[0].level, len, len));
 
diff --git a/test/test.js b/test/test.js
index 5cb0a7ff0b..f3e9da7645 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1332,8 +1332,8 @@ testCM("rtlMovement", function(cm) {
   if (cm.getOption("inputStyle") != "textarea") return;
   forEach(["خحج", "خحabcخحج", "abخحخحجcd", "abخde", "abخح2342خ1حج", "خ1ح2خح3حxج",
            "خحcd", "1خحcd", "abcdeح1ج", "خمرحبها مها!", "foobarر", "خ ة ق",
-           "<img src=\"/בדיקה3.jpg\">"], function(line) {
-    var inv = line.charAt(0) == "خ";
+           "<img src=\"/בדיקה3.jpg\">", "يتم السحب في 05 فبراير 2014"], function(line) {
+    var inv = line.charCodeAt(0) > 128;
     cm.setValue(line + "\n"); cm.execCommand(inv ? "goLineEnd" : "goLineStart");
     var cursors = byClassName(cm.getWrapperElement(), "CodeMirror-cursors")[0];
     var cursor = cursors.firstChild;

From 3c8a77132944cd2b3a02b963450954823d9c9567 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 15 Apr 2015 11:22:58 +0200
Subject: [PATCH 62/72] Add missing semicolon

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index dd1a66a480..cc6d774241 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8722,7 +8722,7 @@
         order.push(new BidiSpan(0, len - m[0].length, len));
       }
       if (order[0].level == 2)
-        order.unshift(new BidiSpan(1, order[0].to, order[0].to))
+        order.unshift(new BidiSpan(1, order[0].to, order[0].to));
       if (order[0].level != lst(order).level)
         order.push(new BidiSpan(order[0].level, len, len));
 

From 9e4e9460ac6f2aae1707a2fd678f6afc28d80144 Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Mon, 13 Apr 2015 12:01:18 -0400
Subject: [PATCH 63/72] [vim] Implement window/buffer-local options.

---
 keymap/vim.js    | 65 ++++++++++++++++++++++++++++++++++++---------
 test/vim_test.js | 80 ++++++++++++++++++++++++++++++++++++++++++--------------
 2 files changed, 114 insertions(+), 31 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 6d28c822fb..b552d71edd 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -397,8 +397,10 @@
       }
     }
 
-    function setOption(name, value) {
+    function setOption(name, value, cm, cfg) {
       var option = options[name];
+      cfg = cfg || {}
+      var scope = cfg.scope;
       if (!option) {
         throw Error('Unknown option: ' + name);
       }
@@ -411,21 +413,41 @@
         }
       }
       if (option.callback) {
-        option.callback(value);
+        if (scope !== 'local') {
+          option.callback(value, undefined);
+        }
+        if (scope !== 'global' && cm) {
+          option.callback(value, cm);
+        }
       } else {
-        option.value = option.type == 'boolean' ? !!value : value;
+        if (scope !== 'local') {
+          option.value = option.type == 'boolean' ? !!value : value;
+        }
+        if (scope !== 'global' && cm) {
+          cm.state.vim.options[name] = {value: value};
+        }
       }
     }
 
-    function getOption(name) {
+    function getOption(name, cm, cfg) {
       var option = options[name];
+      cfg = cfg || {}
+      var scope = cfg.scope;
       if (!option) {
         throw Error('Unknown option: ' + name);
       }
       if (option.callback) {
-        return option.callback();
+        var local = cm && option.callback(undefined, cm);
+        if (scope !== 'global' && local !== undefined) {
+          return local;
+        }
+        if (scope !== 'local') {
+          return option.callback();
+        }
+        return;
       } else {
-        return option.value;
+        var local = (scope !== 'global') && (cm && cm.state.vim.options[name]);
+        return (local || (scope !== 'local') && option || {}).value;
       }
     }
 
@@ -581,8 +603,9 @@
           visualBlock: false,
           lastSelection: null,
           lastPastedText: null,
-          sel: {
-          }
+          sel: {},
+          // Buffer-local/window-local values of vim options.
+          options: {}
         };
       }
       return cm.state.vim;
@@ -640,6 +663,8 @@
         // Add user defined key bindings.
         exCommandDispatcher.map(lhs, rhs, ctx);
       },
+      // TODO: Expose setOption and getOption as instance methods. Need to decide how to namespace
+      // them, or somehow make them work with the existing CodeMirror setOption/getOption API.
       setOption: setOption,
       getOption: getOption,
       defineOption: defineOption,
@@ -3881,7 +3906,10 @@
       { name: 'write', shortName: 'w' },
       { name: 'undo', shortName: 'u' },
       { name: 'redo', shortName: 'red' },
-      { name: 'set', shortName: 'set' },
+      { name: 'set', shortName: 'se' },
+      { name: 'set', shortName: 'se' },
+      { name: 'setlocal', shortName: 'setl' },
+      { name: 'setglobal', shortName: 'setg' },
       { name: 'sort', shortName: 'sor' },
       { name: 'substitute', shortName: 's', possiblyAsync: true },
       { name: 'nohlsearch', shortName: 'noh' },
@@ -4146,6 +4174,9 @@
       },
       set: function(cm, params) {
         var setArgs = params.args;
+        // Options passed through to the setOption/getOption calls. May be passed in by the
+        // local/global versions of the set command
+        var setCfg = params.setCfg || {};
         if (!setArgs || setArgs.length < 1) {
           if (cm) {
             showConfirm(cm, 'Invalid mapping: ' + params.input);
@@ -4175,7 +4206,7 @@
           value = true;
         }
         if (!optionIsBoolean && !value || forceGet) {
-          var oldValue = getOption(optionName);
+          var oldValue = getOption(optionName, cm, setCfg);
           // If no value is provided, then we assume this is a get.
           if (oldValue === true || oldValue === false) {
             showConfirm(cm, ' ' + (oldValue ? '' : 'no') + optionName);
@@ -4183,10 +4214,20 @@
             showConfirm(cm, '  ' + optionName + '=' + oldValue);
           }
         } else {
-          setOption(optionName, value);
+          setOption(optionName, value, cm, setCfg);
         }
       },
-      registers: function(cm,params) {
+      setlocal: function (cm, params) {
+        // setCfg is passed through to setOption
+        params.setCfg = {scope: 'local'};
+        this.set(cm, params);
+      },
+      setglobal: function (cm, params) {
+        // setCfg is passed through to setOption
+        params.setCfg = {scope: 'global'};
+        this.set(cm, params);
+      },
+      registers: function(cm, params) {
         var regArgs = params.args;
         var registers = vimGlobalState.registerController.registers;
         var regInfo = '----------Registers----------<br><br>';
diff --git a/test/vim_test.js b/test/vim_test.js
index 17e4d80cb7..518d836c20 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -504,7 +504,7 @@ testVim('{', function(cm, vim, helpers) {
   helpers.doKeys('6', '{');
   helpers.assertCursorAt(0, 0);
 }, { value: 'a\n\nb\nc\n\nd' });
-testVim('paragraph motions', function(cm, vim, helpers) {
+testVim('paragraph_motions', function(cm, vim, helpers) {
   cm.setCursor(10, 0);
   helpers.doKeys('{');
   helpers.assertCursorAt(4, 0);
@@ -3712,41 +3712,83 @@ testVim('set_string', function(cm, vim, helpers) {
   eq('c', CodeMirror.Vim.getOption('testoption'));
 });
 testVim('ex_set_string', function(cm, vim, helpers) {
-  CodeMirror.Vim.defineOption('testoption', 'a', 'string');
+  CodeMirror.Vim.defineOption('testopt', 'a', 'string');
   // Test default value is set.
-  eq('a', CodeMirror.Vim.getOption('testoption'));
+  eq('a', CodeMirror.Vim.getOption('testopt'));
   try {
-    // Test fail to set 'notestoption'
-    helpers.doEx('set notestoption=b');
+    // Test fail to set 'notestopt'
+    helpers.doEx('set notestopt=b');
     fail();
   } catch (expected) {};
   // Test setOption
-  helpers.doEx('set testoption=c')
-  eq('c', CodeMirror.Vim.getOption('testoption'));
+  helpers.doEx('set testopt=c')
+  eq('c', CodeMirror.Vim.getOption('testopt'));
+  helpers.doEx('set testopt=c')
+  eq('c', CodeMirror.Vim.getOption('testopt', cm)); //local || global
+  eq('c', CodeMirror.Vim.getOption('testopt', cm, {scope: 'local'})); // local
+  eq('c', CodeMirror.Vim.getOption('testopt', cm, {scope: 'global'})); // global
+  eq('c', CodeMirror.Vim.getOption('testopt')); // global
+  // Test setOption global
+  helpers.doEx('setg testopt=d')
+  eq('c', CodeMirror.Vim.getOption('testopt', cm));
+  eq('c', CodeMirror.Vim.getOption('testopt', cm, {scope: 'local'}));
+  eq('d', CodeMirror.Vim.getOption('testopt', cm, {scope: 'global'}));
+  eq('d', CodeMirror.Vim.getOption('testopt'));
+  // Test setOption local
+  helpers.doEx('setl testopt=e')
+  eq('e', CodeMirror.Vim.getOption('testopt', cm));
+  eq('e', CodeMirror.Vim.getOption('testopt', cm, {scope: 'local'}));
+  eq('d', CodeMirror.Vim.getOption('testopt', cm, {scope: 'global'}));
+  eq('d', CodeMirror.Vim.getOption('testopt'));
 });
 testVim('ex_set_callback', function(cm, vim, helpers) {
-  var storedVal = 'a';
+  var global;
 
-  function cb(val) {
+  function cb(val, cm, cfg) {
     if (val === undefined) {
-      return storedVal;
+      // Getter
+      if (cm) {
+        return cm._local;
+      } else {
+        return global;
+      }
     } else {
-      storedVal = val;
+      // Setter
+      if (cm) {
+        cm._local = val;
+      } else {
+        global = val;
+      }
     }
   }
 
-  CodeMirror.Vim.defineOption('testcboption', undefined, 'string', cb);
+  CodeMirror.Vim.defineOption('testopt', 'a', 'string', cb);
   // Test default value is set.
-  eq('a', CodeMirror.Vim.getOption('testcboption'));
+  eq('a', CodeMirror.Vim.getOption('testopt'));
   try {
-    // Test fail to set 'notestcboption'
-    helpers.doEx('set notestcboption=b');
+    // Test fail to set 'notestopt'
+    helpers.doEx('set notestopt=b');
     fail();
   } catch (expected) {};
-  // Test setOption
-  helpers.doEx('set testcboption=c')
-  eq('c', CodeMirror.Vim.getOption('testcboption'));
-})
+  // Test setOption (Identical to the string tests, but via callback instead)
+  helpers.doEx('set testopt=c')
+  eq('c', CodeMirror.Vim.getOption('testopt', cm)); //local || global
+  eq('c', CodeMirror.Vim.getOption('testopt', cm, {scope: 'local'})); // local
+  eq('c', CodeMirror.Vim.getOption('testopt', cm, {scope: 'global'})); // global
+  eq('c', CodeMirror.Vim.getOption('testopt')); // global
+  // Test setOption global
+  helpers.doEx('setg testopt=d')
+  eq('c', CodeMirror.Vim.getOption('testopt', cm));
+  eq('c', CodeMirror.Vim.getOption('testopt', cm, {scope: 'local'}));
+  eq('d', CodeMirror.Vim.getOption('testopt', cm, {scope: 'global'}));
+  eq('d', CodeMirror.Vim.getOption('testopt'));
+  // Test setOption local
+  helpers.doEx('setl testopt=e')
+  eq('e', CodeMirror.Vim.getOption('testopt', cm));
+  eq('e', CodeMirror.Vim.getOption('testopt', cm, {scope: 'local'}));
+  eq('d', CodeMirror.Vim.getOption('testopt', cm, {scope: 'global'}));
+  eq('d', CodeMirror.Vim.getOption('testopt'));
+});
 // TODO: Reset key maps after each test.
 testVim('ex_map_key2key', function(cm, vim, helpers) {
   helpers.doEx('map a x');

From 7ea815d596633627824c6138b649dba5be54df5c Mon Sep 17 00:00:00 2001
From: Christopher Pfohl <Christopher.Pfohl@gmail.com>
Date: Wed, 15 Apr 2015 13:13:51 -0400
Subject: [PATCH 64/72] [sql mode] Add `declare` keyword for TSQL

https://msdn.microsoft.com/en-us/library/ms189822.aspx
---
 mode/sql/sql.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index 1d434b7cbb..fb1c6cb5ce 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -280,7 +280,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
   CodeMirror.defineMIME("text/x-mssql", {
     name: "sql",
     client: set("charset clear connect edit ego exit go help nopager notee nowarning pager print prompt quit rehash source status system tee"),
-    keywords: set(sqlKeywords + "begin trigger proc view index for add constraint key primary foreign collate clustered nonclustered"),
+    keywords: set(sqlKeywords + "begin trigger proc view index for add constraint key primary foreign collate clustered nonclustered declare"),
     builtin: set("bigint numeric bit smallint decimal smallmoney int tinyint money float real char varchar text nchar nvarchar ntext binary varbinary image cursor timestamp hierarchyid uniqueidentifier sql_variant xml table "),
     atoms: set("false true null unknown"),
     operatorChars: /^[*+\-%<>!=]/,

From a3636f374855b5d86dd83ca9442cc006bfa9da15 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 16 Apr 2015 13:08:49 +0200
Subject: [PATCH 65/72] [vim keymap] Fix missing semicolons

---
 keymap/vim.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index b552d71edd..9e21beb4b5 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -399,7 +399,7 @@
 
     function setOption(name, value, cm, cfg) {
       var option = options[name];
-      cfg = cfg || {}
+      cfg = cfg || {};
       var scope = cfg.scope;
       if (!option) {
         throw Error('Unknown option: ' + name);
@@ -431,7 +431,7 @@
 
     function getOption(name, cm, cfg) {
       var option = options[name];
-      cfg = cfg || {}
+      cfg = cfg || {};
       var scope = cfg.scope;
       if (!option) {
         throw Error('Unknown option: ' + name);

From 346d16ce3f17d32518bf7431c5bfee726286bc54 Mon Sep 17 00:00:00 2001
From: David Barnett <dbarnett@google.com>
Date: Thu, 16 Apr 2015 21:30:53 -0400
Subject: [PATCH 66/72] Add support for configuring language mode via vim
 'filetype' setting

---
 keymap/vim.js    | 33 ++++++++++++++++++++++++++++++---
 test/vim_test.js | 29 +++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 9e21beb4b5..2da3087924 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -382,7 +382,8 @@
     }
 
     var options = {};
-    function defineOption(name, defaultValue, type, callback) {
+    var optionAliases = {};
+    function defineOption(name, defaultValue, type, aliases, callback) {
       if (defaultValue === undefined && !callback) {
         throw Error('defaultValue is required unless callback is provided');
       }
@@ -392,6 +393,11 @@
         defaultValue: defaultValue,
         callback: callback
       };
+      if (aliases !== undefined) {
+        for (var i = 0; i < aliases.length; i++) {
+          optionAliases[aliases[i]] = name;
+        }
+      }
       if (defaultValue) {
         setOption(name, defaultValue);
       }
@@ -451,6 +457,21 @@
       }
     }
 
+    defineOption('filetype', undefined, 'string', ['ft'], function(name, cm) {
+      // Option is local. Do nothing for global.
+      if (cm === undefined) {
+        return;
+      }
+      // The 'filetype' option proxies to the CodeMirror 'mode' option.
+      if (name === undefined) {
+        var mode = cm.getMode().name;
+        return mode == 'null' ? '' : mode;
+      } else {
+        var mode = name == '' ? 'null' : name;
+        cm.setOption('mode', mode);
+      }
+    });
+
     var createCircularJumpList = function() {
       var size = 100;
       var pointer = -1;
@@ -4200,14 +4221,20 @@
           optionName = optionName.substring(2);
           value = false;
         }
+
+        // Interpret alias names as the aliased option.
+        if (optionAliases[optionName] !== undefined) {
+          optionName = optionAliases[optionName];
+        }
+
         var optionIsBoolean = options[optionName] && options[optionName].type == 'boolean';
         if (optionIsBoolean && value == undefined) {
           // Calling set with a boolean option sets it to true.
           value = true;
         }
-        if (!optionIsBoolean && !value || forceGet) {
+        // If no value is provided, then we assume this is a get.
+        if (!optionIsBoolean && value === undefined || forceGet) {
           var oldValue = getOption(optionName, cm, setCfg);
-          // If no value is provided, then we assume this is a get.
           if (oldValue === true || oldValue === false) {
             showConfirm(cm, ' ' + (oldValue ? '' : 'no') + optionName);
           } else {
diff --git a/test/vim_test.js b/test/vim_test.js
index 518d836c20..b2b7e25211 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -3788,6 +3788,35 @@ testVim('ex_set_callback', function(cm, vim, helpers) {
   eq('e', CodeMirror.Vim.getOption('testopt', cm, {scope: 'local'}));
   eq('d', CodeMirror.Vim.getOption('testopt', cm, {scope: 'global'}));
   eq('d', CodeMirror.Vim.getOption('testopt'));
+})
+testVim('ex_set_filetype', function(cm, vim, helpers) {
+  CodeMirror.defineMode('test_mode', function() {
+    return {token: function(stream) {
+      stream.match(/^\s+|^\S+/);
+    }};
+  });
+  CodeMirror.defineMode('test_mode_2', function() {
+    return {token: function(stream) {
+      stream.match(/^\s+|^\S+/);
+    }};
+  });
+  // Test mode is set.
+  helpers.doEx('set filetype=test_mode');
+  eq('test_mode', cm.getMode().name);
+  // Test 'ft' alias also sets mode.
+  helpers.doEx('set ft=test_mode_2');
+  eq('test_mode_2', cm.getMode().name);
+});
+testVim('ex_set_filetype_null', function(cm, vim, helpers) {
+  CodeMirror.defineMode('test_mode', function() {
+    return {token: function(stream) {
+      stream.match(/^\s+|^\S+/);
+    }};
+  });
+  cm.setOption('mode', 'test_mode');
+  // Test mode is set to null.
+  helpers.doEx('set filetype=');
+  eq('null', cm.getMode().name);
 });
 // TODO: Reset key maps after each test.
 testVim('ex_map_key2key', function(cm, vim, helpers) {

From 2c452498c550cffb45ed26fc33fb2be5332cc99a Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Thu, 16 Apr 2015 21:41:38 -0400
Subject: [PATCH 67/72] [vim] Make option aliases for programmatic option API

---
 keymap/vim.js | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 2da3087924..7a9b79b4f7 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -382,7 +382,6 @@
     }
 
     var options = {};
-    var optionAliases = {};
     function defineOption(name, defaultValue, type, aliases, callback) {
       if (defaultValue === undefined && !callback) {
         throw Error('defaultValue is required unless callback is provided');
@@ -393,9 +392,9 @@
         defaultValue: defaultValue,
         callback: callback
       };
-      if (aliases !== undefined) {
+      if (aliases) {
         for (var i = 0; i < aliases.length; i++) {
-          optionAliases[aliases[i]] = name;
+          options[aliases[i]] = options[name];
         }
       }
       if (defaultValue) {
@@ -4222,11 +4221,6 @@
           value = false;
         }
 
-        // Interpret alias names as the aliased option.
-        if (optionAliases[optionName] !== undefined) {
-          optionName = optionAliases[optionName];
-        }
-
         var optionIsBoolean = options[optionName] && options[optionName].type == 'boolean';
         if (optionIsBoolean && value == undefined) {
           // Calling set with a boolean option sets it to true.

From de9393f2408424ba326ff29e2b29ddb1a2e7dbed Mon Sep 17 00:00:00 2001
From: David Barnett <dbarnett@google.com>
Date: Fri, 17 Apr 2015 08:51:39 -0700
Subject: [PATCH 68/72] Add support for controlling theme with vim :colorscheme
 command

---
 keymap/vim.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/keymap/vim.js b/keymap/vim.js
index 7a9b79b4f7..ef5dd8c01b 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -3918,6 +3918,7 @@
     // pair of commands that have a shared prefix, at least one of their
     // shortNames must not match the prefix of the other command.
     var defaultExCommandMap = [
+      { name: 'colorscheme', shortName: 'colo' },
       { name: 'map' },
       { name: 'imap', shortName: 'im' },
       { name: 'nmap', shortName: 'nm' },
@@ -4161,6 +4162,13 @@
     };
 
     var exCommands = {
+      colorscheme: function(cm, params) {
+        if (!params.args || params.args.length < 1) {
+          showConfirm(cm, cm.getOption('theme'));
+          return;
+        }
+        cm.setOption('theme', params.args[0]);
+      },
       map: function(cm, params, ctx) {
         var mapArgs = params.args;
         if (!mapArgs || mapArgs.length < 2) {

From b91eb91aec6377516855363294259098e7e1f8d8 Mon Sep 17 00:00:00 2001
From: ms <martin.starman@paninarodigital.com>
Date: Fri, 17 Apr 2015 10:39:57 +0200
Subject: [PATCH 69/72] [real-world uses] Add Kotlin

---
 doc/realworld.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/realworld.html b/doc/realworld.html
index 4ea368e7d2..172bb7ecad 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -103,6 +103,7 @@
       <li><a href="http://jumpseller.com/">Jumpseller</a> (online store builder)</li>
       <li><a href="http://kl1p.com/cmtest/1">kl1p</a> (paste service)</li>
       <li><a href="http://kodtest.com/">Kodtest</a> (HTML/JS/CSS playground)</li>
+      <li><a href="http://try.kotlinlang.org">Kotlin</a> (web-based mini-IDE for Kotlin)</li>
       <li><a href="https://laborate.io/">Laborate</a> (collaborative coding)</li>
       <li><a href="http://lighttable.com/">Light Table</a> (experimental IDE)</li>
       <li><a href="http://liveweave.com/">Liveweave</a> (HTML/CSS/JS scratchpad)</li>

From 21e6d2ff53ba016aedafc13815a1940af70ef277 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20D=C3=B6bertin?=
 <JonasDoebertin@users.noreply.github.com>
Date: Fri, 17 Apr 2015 17:03:02 +0200
Subject: [PATCH 70/72] [markdown mode] Include optional space character after
 atx style headers in formatting

This changes will make the optional space character after ATX style
headers be included within the `cm-formatting` element.
---
 mode/markdown/markdown.js | 4 ++--
 mode/markdown/test.js     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index a7d3d9ab3d..bc5314fc35 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -72,7 +72,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   ,   ulRE = /^[*\-+]\s+/
   ,   olRE = /^[0-9]+\.\s+/
   ,   taskListRE = /^\[(x| )\](?=\s)/ // Must follow ulRE or olRE
-  ,   atxHeaderRE = /^#+/
+  ,   atxHeaderRE = /^#+ ?/
   ,   setextHeaderRE = /^(?:\={1,}|-{1,})$/
   ,   textRE = /^[^#!\[\]*_\\<>` "'(~]+/;
 
@@ -140,7 +140,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     } else if (stream.eatSpace()) {
       return null;
     } else if (match = stream.match(atxHeaderRE)) {
-      state.header = match[0].length <= 6 ? match[0].length : 6;
+      state.header = Math.min(6, match[0].indexOf(" ") !== -1 ? match[0].length - 1 : match[0].length);
       if (modeCfg.highlightFormatting) state.formatting = "header";
       state.f = state.inline;
       return getType(state);
diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index 96ca1aefc7..7bc687f0e6 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -26,7 +26,7 @@
      "[comment&formatting&formatting-code ``][comment foo ` bar][comment&formatting&formatting-code ``]");
 
   FT("formatting_atxHeader",
-     "[header&header-1&formatting&formatting-header&formatting-header-1 #][header&header-1  foo # bar ][header&header-1&formatting&formatting-header&formatting-header-1 #]");
+     "[header&header-1&formatting&formatting-header&formatting-header-1 # ][header&header-1 foo # bar ][header&header-1&formatting&formatting-header&formatting-header-1 #]");
 
   FT("formatting_setextHeader",
      "foo",

From 59ccdda964376d0a15ec94a88d9d306d7c16e9de Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 20 Apr 2015 11:51:43 +0200
Subject: [PATCH 71/72] [manual] Fix inaccuate claim that getModeAt exists on
 docs

Issue #3214
---
 doc/manual.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/manual.html b/doc/manual.html
index 5fc513dac8..1b70128ab6 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1849,7 +1849,7 @@ <h3 id="api_mode">Mode, state, and token-related methods</h3>
       the mode specification, rather than the resolved, instantiated
       <a href="#defineMode">mode object</a>.</dd>
 
-      <dt id="getModeAt"><code><strong>doc.getModeAt</strong>(pos: {line, ch}) → object</code></dt>
+      <dt id="getModeAt"><code><strong>cm.getModeAt</strong>(pos: {line, ch}) → object</code></dt>
       <dd>Gets the inner mode at a given position. This will return
       the same as <a href="#getMode"><code>getMode</code></a> for
       simple modes, but will return an inner mode for nesting modes

From 8deccbd02af7b3569a970c0c5af0ddfc92302c95 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 20 Apr 2015 12:27:41 +0200
Subject: [PATCH 72/72] Mark release 5.2.0

---
 AUTHORS           | 15 +++++++++++++++
 bower.json        |  2 +-
 doc/compress.html |  1 +
 doc/manual.html   |  2 +-
 doc/releases.html | 17 +++++++++++++++++
 index.html        |  2 +-
 lib/codemirror.js |  2 +-
 package.json      |  2 +-
 8 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index a4f2b94b79..b9bf72103c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -25,6 +25,7 @@ Alexandre Bique
 alexey-k
 Alex Piggott
 Aliaksei Chapyzhenka
+Amin Shali
 Amsul
 amuntean
 Amy
@@ -81,10 +82,13 @@ Cheah Chu Yeow
 Chris Coyier
 Chris Granger
 Chris Houseknecht
+Chris Lohfink
 Chris Morgan
 Christian Oyarzun
 Christian Petrov
 Christopher Brown
+Christopher Mitchell
+Christopher Pfohl
 ciaranj
 CodeAnimal
 coderaiser
@@ -106,6 +110,7 @@ Danny Yoo
 darealshinji
 Darius Roberts
 Dave Myers
+David Barnett
 David Mignot
 David Pathakjee
 David Vázquez
@@ -182,6 +187,7 @@ ilvalle
 Ingo Richter
 Irakli Gozalishvili
 Ivan Kurnosov
+Ivoah
 Jacob Lee
 Jakob Miland
 Jakub Vrana
@@ -213,6 +219,7 @@ John Connor
 John Lees-Miller
 John Snelson
 John Van Der Loo
+Jonas Döbertin
 Jonathan Malmaud
 jongalloway
 Jon Malmaud
@@ -223,6 +230,7 @@ Joshua Newman
 Josh Watzman
 jots
 jsoojeon
+ju1ius
 Juan Benavides Romero
 Jucovschi Constantin
 Juho Vuori
@@ -250,6 +258,8 @@ Leonid Khachaturov
 Leon Sorokin
 Leonya Khachaturov
 Liam Newman
+Libo Cannici
+LloydMilligan
 LM
 lochel
 Lorenzo Stoakes
@@ -274,6 +284,7 @@ Marko Bonaci
 Martin Balek
 Martín Gaitán
 Martin Hasoň
+Martin Hunt
 Mason Malone
 Mateusz Paprocki
 Mathias Bynens
@@ -292,6 +303,7 @@ Max Xiantu
 mbarkhau
 Metatheos
 Micah Dubinko
+Michael Grey
 Michael Lehenbauer
 Michael Zhou
 Mighty Guava
@@ -308,6 +320,7 @@ misfo
 mloginov
 Moritz Schwörer
 mps
+ms
 mtaran-google
 Narciso Jaramillo
 Nathan Williams
@@ -319,6 +332,7 @@ nguillaumin
 Ng Zhi An
 Nicholas Bollweg
 Nicholas Bollweg (Nick)
+Nick Kreeger
 Nick Small
 Niels van Groningen
 nightwing
@@ -333,6 +347,7 @@ pablo
 Page
 Panupong Pasupat
 paris
+Paris
 Patil Arpith
 Patrick Stoica
 Patrick Strawderman
diff --git a/bower.json b/bower.json
index 59f7380eab..84808c8bc3 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version":"5.1.1",
+  "version":"5.2.0",
   "main": ["lib/codemirror.js", "lib/codemirror.css"],
   "ignore": [
     "**/.*",
diff --git a/doc/compress.html b/doc/compress.html
index f34e28b97e..581bacf07f 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -36,6 +36,7 @@
       <input type="hidden" id="download" name="download" value="codemirror-compressed.js"/>
       <p>Version: <select id="version" onchange="setVersion(this);" style="padding: 1px;">
         <option value="http://codemirror.net/">HEAD</option>
+        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.2.0;f=">5.2</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.1.0;f=">5.1</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.0.0;f=">5.0</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.13.0;f=">4.13</option>
diff --git a/doc/manual.html b/doc/manual.html
index 1b70128ab6..185be703df 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -63,7 +63,7 @@
 <section class=first id=overview>
     <h2 style="position: relative">
       User manual and reference guide
-      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.1.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.2.0</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/doc/releases.html b/doc/releases.html
index 1ca06d016d..ec2a6bf68c 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,23 @@
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-04-2015: <a href="http://codemirror.net/codemirror-5.2.zip">Version 5.2</a>:</p>
+
+  <ul class="rel-note">
+    <li>Fix several race conditions
+    in <a href="manual.html#addon_show-hint"><code>show-hint</code></a>'s
+    asynchronous mode</li>
+    <li>Fix backspace binding in <a href="../demo/sublime.html">Sublime bindings</a></li>
+    <li>Change the way IME is handled in the <code>"textarea"</code> <a href="manual.html#option_inputStyle">input style</a></li>
+    
+    <li>New modes: <a href="../mode/mumps/index.html">MUMPS</a>, <a href="../mode/handlebars/index.html">Handlebars</a></li>
+    <li>Rewritten modes: <a href="../mode/django/index.html">Django</a>, <a href="../mode/z80/index.html">Z80</a></li>
+    <li>Theme: <a href="../demo/theme.html?liquibyte">Liquibyte</a></li>
+    <li>New option: <a href="manual.html#option_lineWiseCopyCut"><code>lineWiseCopyCut</code></a></li>
+    <li>The <a href="../demo/vim.html">Vim mode</a> now supports buffer-local options and the <code>filetype</code> setting</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/5.1.0...5.2.0">list of patches</a></li>
+  </ul>
+
   <p class="rel">23-03-2015: <a href="http://codemirror.net/codemirror-5.1.zip">Version 5.1</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index a8680cd904..e2cca9f0bb 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.1</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.2</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a> or<br>
       read the <a href="doc/releases.html">release notes</a>.<br>
       There is a <a href="doc/compress.html">minification helper</a>.
diff --git a/lib/codemirror.js b/lib/codemirror.js
index cc6d774241..37e268554c 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8732,7 +8732,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.1.1";
+  CodeMirror.version = "5.2.0";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 5c953fdd72..1d198cd801 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.1.1",
+    "version":"5.2.0",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",